Commit Graph

1914 Commits

Author SHA1 Message Date
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
fa5dd8f981 REQ-3045: 还原json配置 2024-10-10 15:42:22 +08:00
yanglin
69222650df REQ-2752: 去掉兜底配置 2024-10-10 15:40:02 +08:00
xudawei
898ddea091 feat:(REQ-3045) 模版管理V3-优化UrlConfig urlConfig; 2024-10-10 15:20:39 +08:00
xudawei
bc073f5ae7 Merge remote-tracking branch 'origin/feature/REQ-3045' into feature/REQ-3045 2024-10-10 15:08:09 +08:00
xudawei
fa8b276882 feat:(REQ-3045) 模版管理V3-优化UrlConfig urlConfig; 2024-10-10 15:08:04 +08:00
yanglin
b64b2c6c93 Merge branch 'dev' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev 2024-10-10 14:17:45 +08:00
yanglin
faf0c2061d Merge branch 'feature/REQ-2752' into dev 2024-10-10 14:17:38 +08:00
yanglin
6c36a1dd91 REQ-2752: 查询待办信息 2024-10-10 14:17:19 +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
jinhaiyang
a4b1780e6c Merge branch 'hoxfix/20241010' into dev 2024-10-10 11:39:48 +08:00
jinhaiyang
9dc6ebdcd2 modify pom 2024-10-10 11:39:33 +08:00
jinhaiyang
4acd714894 Merge branch 'hoxfix/20241010' into dev 2024-10-10 11:33:06 +08:00
yanglin
8ea0038447 hotfix: 更新模版时,不重新生成自定义按钮的code 2024-10-10 11:32:17 +08:00
yanglin
5118f25b2c hotfix: 添加缺失的依赖 2024-10-10 11:29:19 +08:00
jinhaiyang
ed6b24583d Merge branch 'hoxfix/20241010' into dev 2024-10-10 11:17:19 +08:00
jinhaiyang
b3307b1bf5 delete MybatisInterceptorAnalyzeProcessor 2024-10-10 11:17:13 +08:00
jinhaiyang
2ddcb60f6f Merge branch 'hoxfix/20241010' into dev 2024-10-10 11:00:11 +08:00
jinhaiyang
63c6b1d622 add feign-httpclient 2024-10-10 10:59:39 +08:00
yanglin
6f0302d11f REQ-2752: 添加api url字段 2024-10-10 09:42:55 +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
xudawei
bbd9ccd997 feat:(REQ-3045) 模版管理V3-button列表更换类型属性 2024-10-09 13:52:21 +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
yanglin
75f373393a REQ-2752: 调整字段类型 2024-10-09 11:39:27 +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
2b9b5fccb3 Merge branch 'feature/REQ-3045' into dev 2024-10-08 23:51:00 +08:00
xudawei
1432d78870 feat:(REQ-3045) 模版管理V3-fix templateV3#cardUrlConfig 2024-10-08 23:50:44 +08:00
xudawei
19e8aef267 Merge branch 'feature/REQ-3045' into dev 2024-10-08 23:38:30 +08:00
xudawei
33cfb806f7 feat:(REQ-3045) 模版管理V3-增加templateV3属性填充 2024-10-08 23:38:14 +08:00
xudawei
cac611dd52 Merge branch 'feature/REQ-3045' into dev 2024-10-08 23:15:11 +08:00