Commit Graph

579 Commits

Author SHA1 Message Date
yanglin
a621d84713 Merge branch 'feature/REQ-3045' into dev 2024-10-11 14:51:10 +08:00
yanglin
1631bd3ef2 REQ-2752: a lot of staff 2024-10-11 14:51:02 +08:00
yanglin
bf10344b62 REQ-2752: a lot of staff 2024-10-11 14:50:54 +08:00
xudawei
4561291926 feat:(REQ-3045) 模版管理V3-详情按钮中增加identityCode 2024-10-11 11:51:22 +08:00
xudawei
ce862772cd Merge remote-tracking branch 'origin/feature/REQ-3045' into feature/REQ-3045 2024-10-10 19:01:39 +08:00
xudawei
73c9e7a486 feat:(REQ-3045) 模版管理V3-增加按钮列表中名称 2024-10-10 19:01:34 +08:00
yanglin
9075739bb7 Merge branch 'feature/REQ-3045' into dev 2024-10-10 16:19:12 +08:00
yanglin
776b104037 Merge remote-tracking branch 'origin/feature/REQ-3045' into feature/REQ-3045 2024-10-10 16:19:04 +08:00
yanglin
bd3eb78983 REQ-3045: 同步模版基础 2024-10-10 16:19:02 +08:00
xudawei
3e723a11d0 feat:(REQ-3045) 模版管理V3-优化更新状态优化 2024-10-10 16:12:04 +08:00
yanglin
1f4ea41699 REQ-3045: 迁移老模版数据 2024-10-10 13:45:46 +08:00
yanglin
af9e6f0940 REQ-3045: 完善属性 2024-10-10 13:41:47 +08:00
xudawei
c68577bc25 Merge branch 'feature/REQ-3045' into dev 2024-10-10 11:50:56 +08:00
yanglin
33c79d87d0 Merge remote-tracking branch 'origin/feature/REQ-3045' into feature/REQ-3045 2024-10-09 14:12:21 +08:00
yanglin
c73b117d32 REQ-2752: rollback 2024-10-09 14:12:18 +08:00
xudawei
f468efe470 Merge branch 'feature/REQ-3045' into dev 2024-10-09 14:08:28 +08:00
xudawei
e74a7df1e8 Merge remote-tracking branch 'origin/feature/REQ-3045' into feature/REQ-3045 2024-10-09 14:08:00 +08:00
xudawei
166ebf8c21 feat:(REQ-3045) 模版管理V3-优化删除接口 2024-10-09 14:07:55 +08:00
yanglin
223bb77d67 Merge remote-tracking branch 'origin/feature/REQ-3045' into feature/REQ-3045 2024-10-09 13:43:23 +08:00
yanglin
3427bf6c01 REQ-2752: 调整详情格式 2024-10-09 13:42:53 +08:00
xudawei
8416c9c573 Merge branch 'feature/REQ-3045' into dev 2024-10-09 13:41:32 +08:00
xudawei
4daa135c37 feat:(REQ-3045) 模版管理V3-button列表更换类型属性 2024-10-09 13:40:57 +08:00
xudawei
ec2d053c46 Merge remote-tracking branch 'origin/dev' into dev 2024-10-09 10:20:33 +08:00
xudawei
6843723bb4 Merge branch 'feature/REQ-3045' into dev
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateButtonV3ServiceImpl.java
2024-10-09 10:20:15 +08:00
xudawei
505a077d4e feat:(REQ-3045) 模版管理V3-优化详情接口 2024-10-09 10:19:05 +08:00
yanglin
0257f5552e Merge branch 'dev' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2024-10-09 10:07:23 +08:00
yanglin
5ba5e219dd Merge branch 'feature/REQ-2752' into dev 2024-10-09 10:07:18 +08:00
yanglin
ea5b6f7c5c REQ-2752: 定义接口 2024-10-09 10:07:12 +08:00
xudawei
8aec950777 feat:(REQ-3045) 模版管理V3-日志优化
feat:(REQ-3045) 模版管理V3-增加templateV3属性填充
2024-10-09 09:21:08 +08:00
xudawei
fe2e024f93 Merge branch 'feature/REQ-3045' into dev 2024-10-08 23:59:56 +08:00
xudawei
568cb39911 feat:(REQ-3045) 模版管理V3-templateButtonV3填充属性 2024-10-08 23:59:37 +08:00
xudawei
4b01e5e414 feat:(REQ-3045) 模版管理V3-日志优化 2024-10-08 23:14:48 +08:00
xudawei
d7b8bdc1c0 feat:(REQ-3045) 模版管理V3-日志优化 2024-10-08 23:13:24 +08:00
xudawei
8b20c24abb Merge branch 'feature/REQ-3045' into dev 2024-10-08 19:35:55 +08:00
xudawei
c4b7e2280e feat:(REQ-3045) 模版管理V3-更新状态 2024-10-08 19:35:29 +08:00
xudawei
721f9ea052 Merge branch 'feature/REQ-3045' into dev 2024-10-08 19:20:27 +08:00
xudawei
c72018720c feat:(REQ-3045) 模版管理V3-更新状态 2024-10-08 19:18:47 +08:00
yanglin
2cd0d00065 Merge branch 'dev' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2024-10-08 18:32:54 +08:00
yanglin
e72fbd74af Merge branch 'feature/REQ-2752' into dev 2024-10-08 18:32:47 +08:00
yanglin
8ab3b5c33c REQ-2752: 获取简单的待办信息 2024-10-08 18:32:40 +08:00
xudawei
ca47831661 Merge branch 'feature/REQ-3045' into dev 2024-10-08 17:25:13 +08:00
xudawei
43ca77e786 feat:(REQ-3045) 模版管理V3-更新状态 2024-10-08 17:23:30 +08:00
xudawei
f225f69610 Merge branch 'feature/REQ-3045' into dev 2024-10-08 17:17:11 +08:00
xudawei
f0f1ca54dc feat:(REQ-3045) 模版管理V3-新增/编辑/详情/删除/列表 2024-10-08 17:16:07 +08:00
xudawei
bfeda00d06 Merge branch 'feature/REQ-3045' into dev 2024-10-08 16:02:31 +08:00
xudawei
e85d1b4f57 feat:(REQ-3045) 模版管理V3-新增接口添加 2024-10-08 15:58:21 +08:00
xudawei
44a8f16042 Merge branch 'feature/REQ-3045' into dev 2024-10-08 15:46:44 +08:00
xudawei
3b7bd94728 feat:(REQ-3045) 模版管理V3-新增接口添加 2024-10-08 15:44:37 +08:00
yanglin
0b158f2a6a REQ-3045: 添加JSON handler 2024-10-08 15:22:22 +08:00
yanglin
501fdaac13 REQ-3045: 添加一些基础类 2024-10-08 11:22:19 +08:00