yanglin 3daaa2f391 Merge branch 'refs/heads/REQ-2129' into REQ-2135-2129 ... # Conflicts: # inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/MessageMappingProcessor.java # inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/MessageTemplateDTO.java # inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/MessageTemplateSaveOrUpdateParam.java # inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java # inside-notices/src/main/java/cn/axzo/msg/center/mq/RocketMQConfig.java # msg-center-api/src/main/java/cn/axzo/msg/center/api/mq/PresetButtonPressedMessage.java # msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/PersonV3DTO.java		2024-04-07 17:05:36 +08:00
..
src/main/java/cn/axzo/msg/center/domain	Merge branch 'refs/heads/REQ-2129' into REQ-2135-2129	2024-04-07 17:05:36 +08:00
pom.xml	feat(REQ-1507): 版本升级	2023-11-06 15:42:24 +08:00