Commit Graph

885 Commits

Author SHA1 Message Date
yangqicheng
1f7d89bd2e REQ-2595-增加根据IdentityCode列表批量完成待办接口 2024-10-25 15:11:32 +08:00
yangqicheng
8be1bf1be4 REQ-2595-调整业务待办转交逻辑 2024-10-25 14:06:24 +08:00
yanglin
62c1fc3644 REQ-3045: 处理url没值的情况 2024-10-25 11:04:06 +08:00
yanglin
4c17ca0d36 REQ-3045: 协助原生跳待办新页面 2024-10-24 18:12:16 +08:00
yanglin
fbd5a92fb0 REQ-3045: 处理迁移数据问题 2024-10-24 16:08:48 +08:00
yanglin
fb530c27b8 REQ-3045: 过滤掉找不到工人信息的分组 2024-10-24 14:02:56 +08:00
yanglin
2fc20c746b REQ-3045: 过滤掉找不到工人信息的分组 2024-10-24 13:48:20 +08:00
yanglin
95598179f5 REQ-3045: 过滤掉找不到工人信息的分组 2024-10-24 13:46:47 +08:00
yanglin
803d96bfc4 REQ-3045: 过滤掉找不到工人信息的分组 2024-10-24 11:49:47 +08:00
yanglin
0513a81959 REQ-3045: 减少响应大小 2024-10-24 11:15:02 +08:00
yanglin
4f5daea664 REQ-3045: 减少响应大小 2024-10-24 11:12:52 +08:00
yanglin
712b4a1b0a REQ-3045: 减少响应大小 2024-10-24 11:11:56 +08:00
yanglin
0bd516b5a4 REQ-3045: 减少响应大小 2024-10-24 11:08:43 +08:00
yanglin
0ae1b6f609 REQ-3045: 减少响应大小 2024-10-24 11:05:43 +08:00
yanglin
94956c4dd3 REQ-3045: 减少响应大小 2024-10-24 11:03:52 +08:00
yanglin
8d989c4085 REQ-3045: 减少响应大小 2024-10-24 11:02:33 +08:00
yanglin
2773abef15 REQ-3045: 减少响应大小 2024-10-24 10:57:37 +08:00
yanglin
ac63ee6025 REQ-3045: 减少响应大小 2024-10-24 10:56:56 +08:00
yanglin
3c27197a94 REQ-3045: 减少响应大小 2024-10-24 10:54:48 +08:00
yanglin
f2e21ee55d REQ-3045: 减少响应大小 2024-10-24 10:46:41 +08:00
yanglin
8c008a8006 REQ-3045: 减少响应大小 2024-10-24 10:02:01 +08:00
yanglin
de834eda35 REQ-3045: 减少响应大小 2024-10-24 10:01:17 +08:00
yanglin
536474f659 REQ-3045: 减少响应大小 2024-10-24 09:26:19 +08:00
yanglin
f881eba14f REQ-3045: 减少响应大小 2024-10-23 20:43:54 +08:00
yanglin
eeca74f7e2 REQ-3045: 减少响应大小 2024-10-23 20:42:39 +08:00
yanglin
e03a07431f REQ-3045: 减少响应大小 2024-10-23 19:59:45 +08:00
yanglin
0dd856ee46 REQ-3045: 减少响应大小 2024-10-23 19:58:02 +08:00
yanglin
8fb298d101 REQ-3045: 减少响应大小 2024-10-23 19:49:39 +08:00
yanglin
57b124ef0f REQ-3045: 减少响应大小 2024-10-23 19:33:29 +08:00
yanglin
3af80289da REQ-3045: 减少响应大小 2024-10-23 19:18:38 +08:00
yanglin
d645f050e3 REQ-3045: 去掉一些无用字段 2024-10-23 18:28:21 +08:00
yanglin
b6a614d1fd REQ-3045: 定义新的api 2024-10-23 18:24:26 +08:00
yanglin
667325c357 REQ-3045: 兼容老属性 2024-10-23 17:58:52 +08:00
yanglin
dcb14beef6 REQ-3045: url 2024-10-23 17:29:54 +08:00
yanglin
ebde99a40e REQ-3045: url 2024-10-23 15:27:19 +08:00
yanglin
6d08b4ba13 REQ-3045: url 2024-10-23 15:26:57 +08:00
yanglin
8a9925da91 REQ-3045: url 2024-10-23 15:25:20 +08:00
yanglin
14c83f924c REQ-3045: url 2024-10-23 15:11:24 +08:00
yanglin
264764c787 REQ-3046: cms的IM跳转 2024-10-23 14:00:48 +08:00
yanglin
f98b14c5e5 REQ-3046: cms的IM跳转 2024-10-23 11:50:21 +08:00
yanglin
6a1ff71eed REQ-3046: cms的IM跳转 2024-10-23 11:43:25 +08:00
yanglin
ebfc00d18e REQ-3046: cms的IM跳转 2024-10-23 11:38:35 +08:00
yanglin
2cffc27bbe REQ-3046: fix bug 2024-10-23 10:17:25 +08:00
yanglin
7625e4586b REQ-2752: 定义接口 2024-10-23 09:46:26 +08:00
yanglin
e8e7c668a7 REQ-2752: 获取简单的待办信息 2024-10-23 09:46:26 +08:00
yanglin
50bdc09fa7 REQ-3046: fix bug 2024-10-22 18:25:44 +08:00
yanglin
6aac1936a9 Merge branch 'dev' into feature/REQ-3045 2024-10-22 17:37:21 +08:00
yanglin
6b36a1b88b REQ-3046: fix bug 2024-10-22 17:37:17 +08:00
yanglin
fdd64aabe2 Merge branch 'feature/REQ-3045' into dev 2024-10-22 16:46:54 +08:00
yanglin
e98710a703 REQ-3046: fix bug 2024-10-22 16:46:17 +08:00
yanglin
f93b111a55 Merge branch 'feature/REQ-3045' into dev 2024-10-22 16:21:01 +08:00
yanglin
d0a59ed315 REQ-3046: fix bug 2024-10-22 16:20:55 +08:00
yanglin
9cc79e94ef Merge branch 'feature/REQ-3045' into dev 2024-10-22 15:50:31 +08:00
yanglin
d080e37635 REQ-3046: fix bug 2024-10-22 15:50:25 +08:00
yanglin
e6838d75f1 Merge branch 'feature/REQ-3045' into dev 2024-10-22 14:44:46 +08:00
yanglin
4cf4ffb9fd REQ-3046: 设计分组详情的链接名称 2024-10-22 14:44:41 +08:00
yanglin
f34952b81f Merge branch 'feature/REQ-3045' into dev 2024-10-22 14:22:43 +08:00
yanglin
5db74c0ed9 REQ-3046: 设计分组详情的链接名称 2024-10-22 14:22:35 +08:00
yanglin
42fc866ac0 Merge branch 'feature/REQ-3045' into dev 2024-10-22 13:50:47 +08:00
yanglin
f0818e560a REQ-3046: 显示在卡片上的按钮 2024-10-22 13:50:40 +08:00
yanglin
b0b208bdb7 Merge branch 'feature/REQ-3045' into dev 2024-10-22 11:04:09 +08:00
yanglin
f32f4fd531 REQ-3046: 显示在卡片上的按钮 2024-10-22 11:04:01 +08:00
yanglin
1538c02f02 Merge branch 'feature/REQ-3045' into dev 2024-10-22 09:31:25 +08:00
yanglin
373937183b REQ-3046: 显示在卡片上的按钮 2024-10-22 09:31:19 +08:00
yanglin
35bf8ba33f Merge branch 'feature/REQ-3045' into dev 2024-10-22 09:29:01 +08:00
yanglin
97e588a1df REQ-3046: 显示在卡片上的按钮 2024-10-22 09:28:55 +08:00
yanglin
391461443d Merge branch 'feature/REQ-3045' into dev 2024-10-21 20:44:09 +08:00
yanglin
939ddb6486 REQ-3046: 显示在卡片上的按钮 2024-10-21 20:43:59 +08:00
yanglin
442c06ec48 Merge branch 'feature/REQ-3045' into dev 2024-10-21 20:00:36 +08:00
yanglin
306ec441c6 REQ-3046: 显示在卡片上的按钮 2024-10-21 20:00:31 +08:00
yanglin
e7e7194322 Merge branch 'feature/REQ-3045' into dev 2024-10-21 18:12:41 +08:00
yanglin
d96f846ebb REQ-3046: 返回前端解析后的URL 2024-10-21 18:12:36 +08:00
yanglin
acdff78412 Merge branch 'feature/REQ-3045' into dev 2024-10-21 18:10:26 +08:00
yanglin
f54652f55e REQ-3046: 返回前端解析后的URL 2024-10-21 18:10:18 +08:00
yanglin
993f43ad16 Merge branch 'feature/REQ-3045' into dev 2024-10-21 17:58:11 +08:00
yanglin
283a53df85 REQ-3046: 返回手机信息 2024-10-21 17:58:05 +08:00
yanglin
d2f4b448c3 Merge branch 'feature/REQ-3045' into dev 2024-10-21 17:36:28 +08:00
yanglin
0fb9e1229a REQ-3046: 返回前端解析后的URL 2024-10-21 17:36:21 +08:00
yanglin
2d01efc146 REQ-3046: 返回前端解析后的URL 2024-10-21 17:06:28 +08:00
yanglin
cb314998f1 Merge branch 'feature/REQ-3045' into dev 2024-10-21 17:04:27 +08:00
yanglin
49db01e038 REQ-3046: 返回前端解析后的URL 2024-10-21 17:04:21 +08:00
yanglin
32ed20e188 Merge branch 'feature/REQ-3045' into dev 2024-10-21 16:48:43 +08:00
yanglin
0ce2a538a4 REQ-3046: 返回前端解析后的URL 2024-10-21 16:48:37 +08:00
yanglin
e56599721f Merge branch 'feature/REQ-3045' into dev 2024-10-21 15:29:22 +08:00
yanglin
52b4fb8a9d REQ-3046: 返回前端解析后的URL 2024-10-21 15:29:18 +08:00
yanglin
7eb9dddfe4 Merge branch 'feature/REQ-3045' into dev 2024-10-21 15:29:02 +08:00
yanglin
d2c2930d90 REQ-3046: 返回前端解析后的URL 2024-10-21 15:28:53 +08:00
yanglin
796e07fed5 Merge branch 'feature/REQ-2985' into dev 2024-10-21 15:24:37 +08:00
yanglin
1a5730326f REQ-2985: 批量完成待办 2024-10-21 15:24:25 +08:00
yanglin
aea96bbc6c Merge branch 'feature/REQ-3045' into dev 2024-10-21 14:59:19 +08:00
yanglin
d73bfafb78 REQ-3046: 返回前端解析后的URL 2024-10-21 14:59:14 +08:00
yanglin
6da8956011 Merge branch 'feature/REQ-3045' into dev 2024-10-21 14:32:55 +08:00
yanglin
c7e9b91039 REQ-3046: 返回前端解析后的URL 2024-10-21 14:32:49 +08:00
yanglin
a839b57a39 Merge branch 'feature/REQ-3045' into dev 2024-10-21 11:23:18 +08:00
yanglin
b278bd09df REQ-3046: 定义新字段, 准备返回前端解析后的URL 2024-10-21 11:23:11 +08:00
yanglin
42fe74a7ca Merge branch 'feature/REQ-3045' into dev 2024-10-18 18:37:50 +08:00
yanglin
2cf6ce8463 REQ-3046: 适配详情 2024-10-18 18:35:26 +08:00
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
664582d1dd REQ-3046: 适配详情 2024-10-18 17:59:44 +08:00
yanglin
70f9124ce4 REQ-3046: 适配详情 2024-10-18 17:46:52 +08:00
yanglin
ba27d6eab9 Merge branch 'feature/REQ-3045' into dev 2024-10-18 16:30:02 +08:00
yanglin
811275d229 REQ-3046: 处理按钮的过滤 2024-10-18 16:29:56 +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
8d8df14b36 空提交触发打包 2024-10-17 18:20:30 +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
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
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