Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot into feature/noticews

Browse Source

# Conflicts:
#	sql/mysql5/youlai_boot.sql
#	src/main/java/com/youlai/boot/module/websocket/service/MessageService.java
#	src/main/java/com/youlai/boot/module/websocket/service/WebsocketService.java
#	src/main/java/com/youlai/boot/module/websocket/service/impl/WebsocketServiceImpl.java
#	src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java

...

This commit is contained in:

胡少翔

2024-09-12 09:36:04 +08:00

parent f5977783ff c7b593d85e

commit fa77b5cb8c

71 changed files with 1040 additions and 1066 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

src/main/resources/templates/generator/api.ts.vm → src/main/resources/templates/codegen/api.ts.vm

0

src/main/resources/templates/generator/controller.java.vm → src/main/resources/templates/codegen/controller.java.vm

0

src/main/resources/templates/generator/converter.java.vm → src/main/resources/templates/codegen/converter.java.vm

0

src/main/resources/templates/generator/entity.java.vm → src/main/resources/templates/codegen/entity.java.vm

0

src/main/resources/templates/generator/form.java.vm → src/main/resources/templates/codegen/form.java.vm

0

src/main/resources/templates/generator/index.vue.vm → src/main/resources/templates/codegen/index.vue.vm

0

src/main/resources/templates/generator/mapper.java.vm → src/main/resources/templates/codegen/mapper.java.vm

0

src/main/resources/templates/generator/mapper.xml.vm → src/main/resources/templates/codegen/mapper.xml.vm

0

src/main/resources/templates/generator/query.java.vm → src/main/resources/templates/codegen/query.java.vm

0

src/main/resources/templates/generator/service.java.vm → src/main/resources/templates/codegen/service.java.vm

0

src/main/resources/templates/generator/serviceImpl.java.vm → src/main/resources/templates/codegen/serviceImpl.java.vm

0

src/main/resources/templates/generator/vo.java.vm → src/main/resources/templates/codegen/vo.java.vm