yanglin 9f0d482b2f Merge branch 'feature/REQ-3057-card' into feature/REQ-3201 ... # Conflicts: # im-center-api/pom.xml # im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/SendTemplateMessageParam.java # im-center-server/src/main/java/cn/axzo/im/controller/MessageController.java # im-center-server/src/main/java/cn/axzo/im/entity/HistoryRecordExt.java # im-center-server/src/main/java/cn/axzo/im/entity/MessageHistory.java # im-center-server/src/main/java/cn/axzo/im/entity/MessageTask.java # im-center-server/src/main/java/cn/axzo/im/entity/MessageUpdateRetry.java # im-center-server/src/main/java/cn/axzo/im/send/handler/CommonSendBatchHandler.java # im-center-server/src/main/java/cn/axzo/im/send/handler/CommonSendOneHandler.java # im-center-server/src/main/java/cn/axzo/im/send/handler/CustomSendBatchHandler.java # im-center-server/src/main/java/cn/axzo/im/send/handler/CustomSendOneHandler.java # im-center-server/src/main/java/cn/axzo/im/service/impl/MessageTaskServiceImpl.java		2024-12-05 17:23:50 +08:00
..
src/main/java/cn/axzo/im/center/common	Merge branch 'feature/REQ-3057-card' into feature/REQ-3201	2024-12-05 17:23:50 +08:00
pom.xml	feat:接口设计&接口实现	2023-10-11 14:01:50 +08:00