Commit Graph

597 Commits

Author SHA1 Message Date
yanglin
e8fce86564 Merge branch 'feature/REQ-3045' into dev 2024-10-12 14:36:48 +08:00
yanglin
88b91be570 REQ-3045: 不要在链接中保留过多无用的字段 2024-10-12 14:36:36 +08:00
yanglin
f3221353cb Merge branch 'feature/REQ-3045' into dev 2024-10-12 14:34:27 +08:00
yanglin
c8b2fe64e5 REQ-3045: 不要在链接中保留过多无用的字段 2024-10-12 14:34:10 +08:00
yanglin
1a94fb03dd Merge branch 'feature/REQ-3045' into dev 2024-10-12 11:19:39 +08:00
yanglin
9f12b3a97e REQ-3045: 添加说明 2024-10-12 09:19:22 +08:00
yanglin
5d11c6a137 REQ-3045: 添加说明 2024-10-12 09:19:14 +08:00
yanglin
589f919836 Merge branch 'feature/REQ-3045' into dev 2024-10-11 18:08:08 +08:00
yanglin
dce73a8cca Merge remote-tracking branch 'origin/feature/REQ-3045' into feature/REQ-3045 2024-10-11 18:08:04 +08:00
yanglin
57d1c0e11e REQ-2752: 刷审批流程按钮 2024-10-11 18:08:00 +08:00
xudawei
84e18a4d0b feat:(REQ-3045) 模版管理V3-buttons中加上apiUrl 2024-10-11 18:02:56 +08:00
yanglin
5fdec8e389 Merge branch 'feature/REQ-3045' into dev 2024-10-11 17:56:54 +08:00
yanglin
5c78b6a3ca REQ-2752: 刷审批流程按钮 2024-10-11 17:56:47 +08:00
yanglin
1cc3b3f146 Merge branch 'feature/REQ-3045' into dev 2024-10-11 16:33:41 +08:00
yanglin
4e92024d56 REQ-2752: 刷审批流程按钮 2024-10-11 16:33:34 +08:00
yanglin
714093d5df Merge branch 'feature/REQ-3045' into dev 2024-10-11 15:13:54 +08:00
yanglin
d110411408 REQ-2752: a lot of staff 2024-10-11 15:13:43 +08:00
yanglin
42fb9c7655 REQ-2752: a lot of staff 2024-10-11 14:53:57 +08:00
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