Commit Graph

631 Commits

Author SHA1 Message Date
yanglin
bf31ea6f37 Merge branch 'feature/REQ-3045' into dev
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoSimpleQueryService.java
2024-10-18 09:31:54 +08:00
yanglin
d5a78772d4 REQ-3046: 设置卡片的跳转 2024-10-17 17:56:14 +08:00
yanglin
f1927eb7c2 REQ-3046: 用一个单独的字段存显示在卡片上的字段 2024-10-17 16:06:49 +08:00
yanglin
7d95b3efa2 REQ-3046: a lot of staff 2024-10-17 15:28:49 +08:00
yanglin
688b145110 REQ-3046: a lot of staff 2024-10-17 15:27:33 +08:00
yanglin
b55eb826bc REQ-3046: a lot of staff 2024-10-17 15:07:02 +08:00
yanglin
751af0b2ce REQ-3046: a lot of staff 2024-10-17 15:05:52 +08:00
yanglin
a8ca0a5e99 REQ-3046: a lot of staff 2024-10-17 15:04:34 +08:00
yanglin
6eb185c1d9 Merge branch 'master' into feature/REQ-3045 2024-10-17 15:03:20 +08:00
yanglin
70f41c6fe4 REQ-3046: a lot of staff 2024-10-17 14:59:27 +08:00
yanglin
802917e303 REQ-3046: a lot of staff 2024-10-17 09:55:37 +08:00
yanglin
cf66d98fe4 REQ-3046: a lot of staff 2024-10-16 20:00:33 +08:00
yanglin
e1af31200c Merge branch 'feature/REQ-3045' into dev 2024-10-16 18:17:42 +08:00
yanglin
a922791bb8 REQ-3046: backup 2024-10-16 18:17:36 +08:00
yanglin
4e07b0091e Merge branch 'feature/REQ-3045' into dev 2024-10-16 18:16:46 +08:00
yanglin
00b9c6728c REQ-3046: backup 2024-10-16 18:16:34 +08:00
yanglin
14f1d3706f Merge branch 'feature/REQ-2874' into release-20241016
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateRouterServiceImpl.java
2024-10-16 14:00:20 +08:00
yanglin
8744cd20c5 REQ-3046: backup 2024-10-16 13:59:13 +08:00
yanglin
f248417195 Merge branch 'feature/REQ-3045' into dev 2024-10-14 15:45:57 +08:00
yanglin
d921af2d3e REQ-3046: 准备定义接口 2024-10-14 15:45:51 +08:00
yanglin
52daecb38e Merge branch 'feature/REQ-3045' into dev 2024-10-14 15:40:00 +08:00
yanglin
da865253f6 REQ-3046: 准备定义接口 2024-10-14 15:39:52 +08:00
yanglin
5fd6ebb33d Merge branch 'feature/REQ-3045' into dev 2024-10-12 18:17:27 +08:00
yanglin
54ae540cee REQ-3045: 不要在链接中保留过多无用的字段 2024-10-12 17:48:03 +08:00
yanglin
ace06eefb1 REQ-3045: 不要在链接中保留过多无用的字段 2024-10-12 17:47:54 +08:00
yanglin
02c030b786 Merge branch 'feature/REQ-3045' into dev 2024-10-12 17:13:43 +08:00
xudawei
f1ab8e4adb feat:(REQ-3045) 模版管理V3-新增/编辑校验提示信息优化 2024-10-12 17:00:24 +08:00
yanglin
edebbca46d REQ-3045: 添加校验 2024-10-12 16:13:28 +08:00
yanglin
96b7ffdfbd Merge branch 'feature/REQ-3045' into dev 2024-10-12 16:08:20 +08:00
yanglin
d38145ab3f REQ-3045: 添加校验 2024-10-12 16:08:08 +08:00
yanglin
61fcaea958 REQ-3045: fix npe 2024-10-12 15:40:54 +08:00
yanglin
6072e594a6 REQ-3045: fix npe 2024-10-12 14:45:54 +08:00
yanglin
f6bb8c6f3f Merge branch 'feature/REQ-3045' into dev 2024-10-12 14:41:37 +08:00
yanglin
fedb4dd34b REQ-3045: 不要在链接中保留过多无用的字段 2024-10-12 14:41:22 +08:00
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