Commit Graph

1335 Commits

Author SHA1 Message Date
yanglin
23952dc21d Merge branch 'feature/REQ-3045' into dev 2024-10-18 18:16:55 +08:00
yanglin
831ed996ff REQ-3046: 适配详情 2024-10-18 18:16:49 +08:00
yanglin
70f9124ce4 REQ-3046: 适配详情 2024-10-18 17:46:52 +08:00
yanglin
ca833aaafb Merge branch 'feature/REQ-3045' into dev 2024-10-18 17:41:38 +08:00
yanglin
0fb3bf113a REQ-3046: 适配详情 2024-10-18 17:41:26 +08:00
yanglin
7099f4a2ae Merge branch 'feature/REQ-3045' into dev
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRespBuilder.java
2024-10-18 17:40:10 +08:00
yanglin
d5ba4b339f REQ-3046: 适配详情 2024-10-18 17:39:19 +08:00
yanglin
fceae7a60b Merge branch 'feature/REQ-3045' into dev 2024-10-18 17:27:07 +08:00
yanglin
bacba962ed REQ-3046: 适配详情 2024-10-18 17:26:57 +08:00
yanglin
f3bff6860b REQ-3046: 适配详情 2024-10-18 17:25:38 +08:00
yanglin
b9b5f996fa Merge branch 'feature/REQ-3045' into dev 2024-10-18 16:54:53 +08:00
yanglin
30d8a49c9e REQ-3046: 适配详情 2024-10-18 16:54:44 +08:00
yanglin
89a74f2b30 Merge branch 'feature/REQ-3045' into dev
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRespBuilder.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoSimpleQueryService.java
2024-10-18 14:53:31 +08:00
yanglin
bd5d2e1c68 REQ-3046: 兼容老逻辑 2024-10-18 14:51:14 +08:00
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
13f13ce9a3 REQ-3046: 添加路由参数到query parameter中 2024-10-17 15:36:53 +08:00
yanglin
688b145110 REQ-3046: a lot of staff 2024-10-17 15:27:33 +08:00
yanglin
9b307bb76a REQ-3046: a lot of staff 2024-10-17 15:25:12 +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
be56e0cc06 Merge branch 'feature/REQ-2752' into dev 2024-10-17 14:34:40 +08:00
yanglin
18c6454ab1 REQ-2752: fix bug 2024-10-17 14:34:28 +08:00
yanglin
802917e303 REQ-3046: a lot of staff 2024-10-17 09:55:37 +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
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
752aff32e1 REQ-3045: 跳过流程的抄送按钮,他们的链接没有配置,保存的时候校验通不过 2024-10-12 18:17:21 +08:00
yanglin
024c374a11 REQ-3045: 不要在链接中保留过多无用的字段 2024-10-12 17:52:29 +08:00
yanglin
acc272577d Merge branch 'feature/REQ-3045' into dev 2024-10-12 17:41:20 +08:00
yanglin
eeb71f3a74 REQ-3045: 不要在链接中保留过多无用的字段 2024-10-12 17:41:09 +08:00
yanglin
0dee318578 REQ-3045: 不要在链接中保留过多无用的字段 2024-10-12 17:40:44 +08:00
yanglin
4310ac2499 Revert "REQ-3045: 不要在链接中保留过多无用的字段"
This reverts commit cb480144a7.
2024-10-12 17:14:58 +08:00
yanglin
02c030b786 Merge branch 'feature/REQ-3045' into dev 2024-10-12 17:13:43 +08:00
yanglin
cb480144a7 REQ-3045: 不要在链接中保留过多无用的字段 2024-10-12 17:13:35 +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
0304ef583e REQ-3045: fix npe 2024-10-12 16:04:46 +08:00
yanglin
64af3e33c5 REQ-3045: fix npe 2024-10-12 16:04:39 +08:00
yanglin
2340629070 REQ-3045: fix npe 2024-10-12 15:50:01 +08:00
yanglin
54b51446c1 REQ-3045: fix npe 2024-10-12 15:49:28 +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
e8fce86564 Merge branch 'feature/REQ-3045' into dev 2024-10-12 14:36:48 +08:00