Theo
|
55ec7673fd
|
Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot into feature/noticews
# Conflicts:
# src/main/java/com/youlai/boot/platform/websocket/service/impl/WebsocketServiceImpl.java
# src/main/java/com/youlai/boot/system/controller/NoticeController.java
# src/main/java/com/youlai/boot/system/controller/NoticeStatusController.java
# src/main/java/com/youlai/boot/system/converter/NoticeConverter.java
# src/main/java/com/youlai/boot/system/converter/NoticeStatusConverter.java
# src/main/java/com/youlai/boot/system/mapper/NoticeMapper.java
# src/main/java/com/youlai/boot/system/mapper/NoticeStatusMapper.java
# src/main/java/com/youlai/boot/system/model/entity/Notice.java
# src/main/java/com/youlai/boot/system/model/entity/NoticeStatus.java
# src/main/java/com/youlai/boot/system/model/form/NoticeForm.java
# src/main/java/com/youlai/boot/system/model/form/NoticeStatusForm.java
# src/main/java/com/youlai/boot/system/model/query/NoticeQuery.java
# src/main/java/com/youlai/boot/system/model/query/NoticeStatusQuery.java
# src/main/java/com/youlai/boot/system/model/vo/NoticeStatusVO.java
# src/main/java/com/youlai/boot/system/model/vo/NoticeVO.java
# src/main/java/com/youlai/boot/system/service/NoticeService.java
# src/main/java/com/youlai/boot/system/service/NoticeStatusService.java
# src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java
# src/main/java/com/youlai/boot/system/service/impl/NoticeStatusServiceImpl.java
|
2024-08-31 20:10:54 +08:00 |
|