Commit Graph

1282 Commits

Author SHA1 Message Date
lilong
c4b59d9574 feat: 解决通过routerParams里面的taskNo
找到taskOrder的情况
2024-02-28 15:38:07 +08:00
yanglin
aa4379038c Merge branch 'feature/REQ-2010' into pre 2024-02-28 15:31:00 +08:00
yanglin
6593ff6a16 REQ-2010: 不返回重复的templateCode 2024-02-28 15:30:12 +08:00
lilong
705366f49b feat: 解决通过bizCode找不到taskOrder的情况 2024-02-28 15:15:33 +08:00
lilong
72e009d90b feat: 解决通过bizCode找不到taskOrder的情况 2024-02-28 15:15:33 +08:00
lilong
649b6edb92 feat: 修改是否已经删除条件 2024-02-28 15:15:32 +08:00
lilong
3a5cc22b24 feat: 通过bizCode查找对应的ouId 2024-02-28 14:26:48 +08:00
yanglin
f3c49a85ec Merge branch 'feature/REQ-2010' into pre
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/MessageMappingProcessor.java
2024-02-28 14:08:47 +08:00
yanglin
b192f76fee REQ-2010: 保存发送失败的原因 2024-02-28 14:07:39 +08:00
李龙
6462cb21f1 Merge branch 'revert-1da5e022' into 'ou_id_migration'
Revert "Merge branch 'ou_id_migration' of...

See merge request universal/infrastructure/backend/msg-center-plat!342
2024-02-28 02:51:34 +00:00
李龙
b6fbb976aa Revert "Merge branch 'ou_id_migration' of /Users/lilong/IdeaProjects/msg-center-plat with conflicts."
This reverts commit 1da5e022e3
2024-02-28 02:51:20 +00:00
lilong
411372a28c feat: 解决找不到ouId的情况 2024-02-28 10:40:56 +08:00
lilong
1da5e022e3 Merge branch 'ou_id_migration' of /Users/lilong/IdeaProjects/msg-center-plat with conflicts. 2024-02-28 10:40:47 +08:00
lilong
5dd8723506 feat: job增加返回success 2024-02-27 23:06:20 +08:00
lilong
e2fdf1ebda feat: 增加打印日志 2024-02-27 21:48:23 +08:00
lilong
4754c49870 feat: 解决从业人员找不到对应的团队的问题 2024-02-27 21:18:42 +08:00
lilong
3fa17bc8e2 feat: 解决private 2024-02-27 20:51:41 +08:00
lilong
2e5379da05 feat: 增加打印日志 2024-02-27 20:46:03 +08:00
yanglin
8bace30418 REQ-2010: fix bugs 2024-02-27 18:33:15 +08:00
lilong
f9cf8ce91e feat: router刷新逻辑修改 2024-02-27 17:25:34 +08:00
lilong
ee0eca380a feat: router刷新逻辑修改 2024-02-27 17:25:34 +08:00
lilong
af0c94b39f feat: router刷新逻辑修改 2024-02-27 17:03:09 +08:00
lilong
000fb277c3 feat: 修改数据刷新逻辑 2024-02-27 14:24:07 +08:00
lilong
9580a44252 feat: 刷数据时增加指定模板条件 2024-02-27 14:17:07 +08:00
yanglin
94fcbf9b68 Merge branch 'feature/REQ-2010' into pre 2024-02-27 13:35:25 +08:00
yanglin
f9d88918ed REQ-2010: fix bugs 2024-02-27 13:35:13 +08:00
yanglin
9e43f39cc1 Merge branch 'feature/REQ-2010' into pre 2024-02-27 11:54:57 +08:00
yanglin
121335d251 REQ-2010: 添加辅助方法 2024-02-27 11:54:53 +08:00
yanglin
1a2265bf0b Merge branch 'feature/REQ-2010' into pre 2024-02-27 11:50:16 +08:00
yanglin
28ceb953ac REQ-2010: 添加辅助方法 2024-02-27 11:50:11 +08:00
lilong
f018420eca feat: 增加 updateOuIdJob 2024-02-27 11:48:05 +08:00
yanglin
d470062a8e Merge branch 'feature/REQ-2010' into pre 2024-02-27 11:25:49 +08:00
yanglin
e9fbf930d8 REQ-2010: 添加辅助方法 2024-02-27 11:25:40 +08:00
李龙
37a16239d0 Merge branch 'test' into 'ou_id_migration'
# Conflicts:
#   inside-notices/pom.xml
#   inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PrivateMessageController.java
#   start/src/main/resources/bootstrap.yml
#   start/src/test/java/cn/axzo/msg/center/message/service/PendingMessageNewServiceTest.java
2024-02-27 03:07:51 +00:00
lilong
fb2f7b1664 feat: 修改成job 2024-02-27 11:04:59 +08:00
yanglin
7e2787743a Merge branch 'feature/REQ-2010' into test 2024-02-27 10:52:31 +08:00
yanglin
2ab6307ea4 REQ-2010: 添加辅助方法 2024-02-27 10:52:27 +08:00
yanglin
344054f4e6 Merge branch 'feature/REQ-2010' into test 2024-02-27 10:38:33 +08:00
yanglin
94fe53c1ff REQ-2010: 添加辅助方法 2024-02-27 10:38:24 +08:00
lilong
0463121d1b feat:增加接口/api前缀 2024-02-27 10:21:33 +08:00
yanglin
1247f9ea26 Merge branch 'feature/REQ-2010' into test 2024-02-27 10:18:11 +08:00
yanglin
808c123044 REQ-2010: 添加辅助方法 2024-02-27 10:18:06 +08:00
yanglin
28d5a6fd8b REQ-2010: 添加辅助方法 2024-02-27 10:17:58 +08:00
yanglin
283064de4a Merge branch 'feature/REQ-2010' into test 2024-02-27 09:59:39 +08:00
yanglin
fea00e2946 REQ-2010: 添加辅助方法 2024-02-27 09:59:34 +08:00
yanglin
5b29492fba Merge branch 'feature/REQ-2010' into test 2024-02-27 09:47:04 +08:00
yanglin
9c23f07507 REQ-2010: 添加辅助方法 2024-02-27 09:46:52 +08:00
yanglin
7ffd13fea8 Merge branch 'feature/REQ-2010' into test 2024-02-27 09:39:13 +08:00
yanglin
be5cf2b39e REQ-2010: 添加辅助方法 2024-02-27 09:38:59 +08:00
yanglin
0597da19f5 Merge branch 'feature/REQ-2010' into test 2024-02-27 09:20:40 +08:00