Commit Graph
2427 Commits
Author SHA1 Message Date
super_liu f91f97847a feat: There is no way the,rar、zip、dot 2022-05-18 11:40:03 +08:00
super_liu af5036172b Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!497
2022-05-18 11:34:53 +08:00
super_liu fea5aab330 feat: There is no way the, TDM 对外分页100查询标准接口 2022-05-18 11:20:54 +08:00
qk 1000757218 update:修改bug 2022-05-18 09:20:03 +08:00
super_liu 9c5ace8356 feat: There is no way the, TDM 分页外部访问标准接口 2022-05-17 17:52:18 +08:00
super_liu 0750ed5532 Merge branch 'develop_master' into FOTON 2022-05-17 16:20:15 +08:00
qk 84767315c8 update:修改bug 2022-05-17 09:06:58 +08:00
super_liu 0f8f5907f4 Merge branch 'develop_master' into FOTON 2022-05-15 00:01:33 +08:00
super_liu 70c53e7b1e Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!496
2022-05-14 20:43:13 +08:00
super_liu aeba2ee4b2 Merge branch 'develop_master' into develop_migration 2022-05-14 20:40:07 +08:00
super_liu c139274f2b feat: There is no way the, 数据问题 导致 读取多文件报错 2022-05-14 20:18:44 +08:00
zhangyanduan 5da14f0d54 fix: 提交新老系统绑定关系 2022-05-12 18:38:49 +08:00
super_liu 11471aede0 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!495
2022-05-12 16:39:01 +08:00
super_liu 9092a549b7 feat: There is no way the, 2022-05-12 16:38:18 +08:00
super_liu df303bbd05 Merge branch 'develop_master' into develop_migration
# Conflicts:
#	doc/sql/数据库改动.sql
2022-05-12 16:37:43 +08:00
super_liu 5c1d0d86b2 feat: There is no way the,福田标准自动变更逻辑 100% 暂定需求 不设置定时周期 2022-05-12 16:34:49 +08:00
super_liu 51a2db5602 feat: There is no way the, 注掉定时器执行周期 2022-05-12 10:34:35 +08:00
super_liu b7341b55f3 feat: There is no way the,福田标准自动变更逻辑 30% 2022-05-12 10:33:39 +08:00
super_liu d041bb4611 feat: There is no way the, update state 30% 2022-05-11 17:42:51 +08:00
super_liu f72d7055b7 feat: There is no way the, 2022-05-11 10:18:37 +08:00
super_liu d5db3fe1bc Merge branch 'develop_master' into FOTON 2022-05-10 16:56:21 +08:00
super_liu 35c9a8f096 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 新需求 #52721

See merge request LiuChao/foton-slrs-system-rest!493
2022-05-10 16:47:09 +08:00
super_liu 16535b304e feat: There is no way the, 新需求 #52721 2022-05-10 16:18:08 +08:00
super_liu 02c3c9fa6a Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 文本索引 根据条件查询 更新索引数据

See merge request LiuChao/foton-slrs-system-rest!492
2022-05-09 16:29:29 +08:00
super_liu 7c21d67edf feat: There is no way the, 文本索引 根据条件查询 更新索引数据 2022-05-09 16:24:39 +08:00
super_liu 6d4340cc31 Merge branch 'develop_master' into FOTON 2022-05-09 15:23:34 +08:00
wangxiahui@91isoft.com d4a936a750 update:修改ocr回调地址中的域名错误 2022-05-09 15:19:35 +08:00
super_liu 5337c11a21 feat: There is no way the, 2022-05-09 11:31:09 +08:00
super_liu 276a83937e feat: There is no way the, @Async 2022-05-09 11:23:43 +08:00
super_liu c7bd02d017 feat: There is no way the, @Async 2022-05-09 10:18:24 +08:00
yuezhihang adce797902 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-05-07 16:29:26 +08:00
yuezhihang e01952afc2 定时任务 根据时间更新 文本状态 2022-05-07 16:29:10 +08:00
super_liu dd0dcd41a1 Merge branch 'develop_master' into FOTON 2022-05-06 21:20:18 +08:00
super_liu 5cb0f2990d feat: There is no way the,not null 2022-05-06 21:16:52 +08:00
王夏晖 39c77bd28e Merge branch 'develop_master' into 'FOTON'
update:awc对接返回访问链接去掉用户信息

See merge request LiuChao/foton-slrs-system-rest!491
2022-05-06 14:57:41 +08:00
wangxiahui@91isoft.com 4347f9d209 update:awc对接返回访问链接去掉用户信息 2022-05-06 14:55:28 +08:00
super_liu c0799ac7fe Merge branch 'develop_master' into FOTON 2022-05-05 17:49:30 +08:00
super_liu 43bda942ea Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 优化ES

See merge request LiuChao/foton-slrs-system-rest!490
2022-05-05 17:33:44 +08:00
super_liu 705c115db3 feat: There is no way the, 优化ES 2022-05-05 17:33:04 +08:00
super_liu a747ce57f3 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 优化ES

See merge request LiuChao/foton-slrs-system-rest!489
2022-05-05 17:02:00 +08:00
super_liu 2b1178e289 feat: There is no way the, 优化ES 2022-05-05 17:00:43 +08:00
super_liu b074ccc5d5 Merge branch 'develop_master' into FOTON 2022-05-05 15:32:53 +08:00
yuezhihang b02e61a6c5 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-05-05 15:30:52 +08:00
yuezhihang e222598ce3 全局搜索 2022-05-05 15:30:43 +08:00
super_liu b9b972d0fa Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!488
2022-05-05 15:09:17 +08:00
super_liu f30cea2a9f feat: There is no way the, 2022-05-05 15:08:16 +08:00
super_liu f8ceedfa5b Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!487
2022-05-05 14:51:18 +08:00
super_liu 26945b241c Merge branch 'develop_master' into develop_migration 2022-05-05 14:50:40 +08:00
super_liu ff6ebc7393 feat: There is no way the, 更新ES 文件ID 默认去掉空格 2022-05-05 14:49:40 +08:00
super_liu a480bca0aa Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 记录es 索引更新

See merge request LiuChao/foton-slrs-system-rest!486
2022-05-05 14:24:55 +08:00