FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,950 Commits 1 Branch 0 Tags
b4410694f18bca164ed787a1240473798301fd65
Commit Graph
2950 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhangjun 460892ce48 查询，改回原状 2022-08-30 18:26:25 +08:00
zhangjun b42a15ebda 按照顺序查询结果 2022-08-30 18:23:58 +08:00
zhangjun 8b25587e77 Merge remote-tracking branch 'origin/develop_master' into FOTON 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
 2022-08-30 18:13:24 +08:00
zhangjun c4f23a11ac 按照顺序查询结果 2022-08-30 18:11:58 +08:00
zhangjun adddb5759e 按照顺序查询结果 2022-08-30 18:07:29 +08:00
zhangjun 09fd662314 查询 2022-08-30 17:29:33 +08:00
zhangjun eaec394e0a 查询 2022-08-30 17:21:48 +08:00
zhangjun 01ca5fa835 Merge remote-tracking branch 'origin/develop_master' into FOTON 2022-08-30 17:17:05 +08:00
zhangjun 145ad2ac2d 需无权限的放在前面 2022-08-30 17:15:47 +08:00
zhangjun e243dbb44f Merge remote-tracking branch 'origin/develop_master' into FOTON 2022-08-30 13:58:00 +08:00
zhangjun 3bff146fb4 还原es查询 + 修改定时任务 GB/T 没有同时更新 2022-08-29 12:13:53 +08:00
zhangjun 3d3a515710 修改无更新记录 2022-08-26 21:16:17 +08:00
zhangjun 43c8fea8b2 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-08-26 15:21:24 +08:00
zhangjun 4c7f086060 非 .keyword 无法查询出结果 2022-08-26 15:20:51 +08:00
zhangjun ae466b86d7 Merge remote-tracking branch 'origin/FOTON' into FOTON 2022-08-25 18:58:36 +08:00
zhangyanduan 0276ca92aa Merge branch 'develop_master' into FOTON 2022-08-25 18:58:06 +08:00
zhangjun a0c44be519 Merge remote-tracking branch 'origin/develop_master' into FOTON 2022-08-25 18:54:53 +08:00
zhangjun 8c25f8fb73 56708 2022-08-25 18:41:25 +08:00
zyd 075cd4768c fix:解决线上ES更新逻辑中获取文件ID时报错的BUG,目前看不到具体参数，此处增加错误输出，后续监测问题 2022-08-25 16:34:09 +08:00
zhangyanduan 84c941612b fix: 修改文件名时，文件中包含.的时候导致文件名不对的BUG 2022-08-25 16:07:39 +08:00
zhangjun 122e639e79 57017 2022-08-25 12:41:25 +08:00
zhangjun 6cd526e613 57017 2022-08-24 14:37:53 +08:00
zhangjun ca4ef75fda 56874 2022-08-23 16:37:14 +08:00
zhangjun 1687202ef5 56983 2022-08-23 14:19:32 +08:00
zhangjun 819d937d72 56694 2022-08-23 13:46:28 +08:00
zhangjun aa13451ac6 56708 2022-08-23 10:14:05 +08:00
396572590@qq.com 2a46d765c6 Merge branch 'develop_master' into FOTON 2022-08-19 17:31:11 +08:00
super_liu 4017e27243 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!578
 2022-08-19 17:29:49 +08:00
396572590@qq.com 9d4609e749 Merge branch 'develop_master' into develop_migration 2022-08-19 17:28:57 +08:00
396572590@qq.com 2ef63ef875 feat: There is no way the, 自动更新状态 添加 更新LOG 2022-08-19 17:26:46 +08:00
396572590@qq.com 405fa26217 Merge branch 'develop_master' into FOTON 2022-08-19 10:02:10 +08:00
zhangyanduan bc11581770 fix: 福田AWC系统对接接口中VPPS编码只识别到第三级 2022-08-18 13:40:58 +08:00
super_liu ce9736de6f Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!574
 2022-08-17 17:42:21 +08:00
396572590@qq.com 0005b8aa6e feat: There is no way the, 56994 分接单手动关联之后条款顺序不对 2022-08-17 16:36:13 +08:00
396572590@qq.com 293f1f1471 feat: There is no way the, 56996 基础库的状态自动变更之后，没有log 2022-08-17 16:25:54 +08:00
super_liu 65a4124615 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!573
 2022-08-17 11:18:14 +08:00
396572590@qq.com f14a6f2c62 feat: There is no way the, 首页征求意见 查询 2022-08-16 17:01:10 +08:00
396572590@qq.com 658d83e47e feat: There is no way the, 56968 引用标准1589跳转没改好 2022-08-12 14:16:41 +08:00
396572590@qq.com 7896a28126 Merge branch 'develop_master' into FOTON 2022-08-10 17:46:53 +08:00
super_liu dd1be531a5 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,  标准 被代替 补漏。。 详情点击代替、被代替标准效验接口修改

See merge request LiuChao/foton-slrs-system-rest!572
 2022-08-10 17:44:15 +08:00
396572590@qq.com fa4778b555 feat: There is no way the, 标准 被代替 补漏。。 详情点击代替、被代替标准效验接口修改 2022-08-10 17:43:44 +08:00
396572590@qq.com 92eff43614 Merge branch 'develop_master' into FOTON 2022-08-10 17:00:57 +08:00
super_liu 179bc9e1e1 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,  标准 被代替 补漏。。 详情点击代替、被代替标准效验接口修改

See merge request LiuChao/foton-slrs-system-rest!571
 2022-08-10 16:56:45 +08:00
396572590@qq.com c86440eb96 feat: There is no way the, 标准 被代替 补漏。。 详情点击代替、被代替标准效验接口修改 2022-08-10 16:55:50 +08:00
super_liu f508297e35 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,  标准 被代替 补漏。。 详情点击代替、被代替标准效验接口修改

See merge request LiuChao/foton-slrs-system-rest!570
 2022-08-10 16:44:52 +08:00
396572590@qq.com 43c59e13e5 feat: There is no way the, 标准 被代替 补漏。。 详情点击代替、被代替标准效验接口修改 2022-08-10 16:26:36 +08:00
zyd abdff75209 fix: 修复查询人员时，组织机构层级等于3层时，获取的集合数量错误导致接口报错无法选择人的BUG 2022-08-10 08:11:38 +08:00
super_liu 2cd8f5e5fe Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!569
 2022-08-08 17:36:34 +08:00
396572590@qq.com b792f585a4 feat: There is no way the, 2022-08-08 16:49:23 +08:00
super_liu 96f8ee33b3 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!568
 2022-08-04 16:11:38 +08:00