Commit Graph
2289 Commits
Author SHA1 Message Date
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 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 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 5cb0f2990d feat: There is no way the,not null 2022-05-06 21:16:52 +08:00
wangxiahui@91isoft.com 4347f9d209 update:awc对接返回访问链接去掉用户信息 2022-05-06 14:55:28 +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
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
super_liu 6ede005450 feat: There is no way the, es 索引更新 2022-05-05 13:54:23 +08:00
yuezhihang f38b96fc92 查询数据的时候增加 sort判断条件避免数据重复展示 2022-05-05 13:45:02 +08:00
super_liu a83e531871 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, AWC LIKE DEL LEFT %

See merge request LiuChao/foton-slrs-system-rest!485
2022-05-05 11:16:54 +08:00
super_liu 3eb8b090e9 feat: There is no way the, AWC LIKE DEL LEFT % 2022-05-05 11:08:07 +08:00
zj a62846f5b4 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-05-04 17:27:26 +08:00
zj c97081eb43 doc文檔重新轉換 2022-05-04 17:26:54 +08:00
super_liu 9c74211995 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 优化ES 优到什么时候

See merge request LiuChao/foton-slrs-system-rest!484
2022-05-04 16:18:08 +08:00
super_liu 9c9793ad63 feat: There is no way the, 优化ES 优到什么时候 2022-05-04 16:14:10 +08:00
super_liu 984c9d645c Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!483
2022-05-03 12:54:21 +08:00
super_liu d10099e227 feat: There is no way the, 2022-05-03 12:53:35 +08:00
super_liu f287e7c52b feat: There is no way the, 2022-05-03 12:30:23 +08:00
super_liu 8d8afb1f2f Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!482
2022-05-03 09:48:42 +08:00
super_liu a2cf5bbd77 feat: There is no way the, 优化ES 分页查询 issue_time_data 2022-05-03 09:45:17 +08:00
super_liu 6e6a04dd9d feat: There is no way the, es 读取文件 2022-05-03 09:41:28 +08:00
super_liu ec317071a0 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!481
2022-05-03 08:07:25 +08:00
super_liu 68ae560e8a feat: There is no way the, 2022-05-03 08:06:48 +08:00
super_liu 9c87e98764 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!480
2022-05-03 07:32:23 +08:00
super_liu 42237e6397 feat: There is no way the, 2022-05-03 07:31:47 +08:00
super_liu f5a25f5c33 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!479
2022-05-03 06:06:01 +08:00
super_liu 4b0056aae8 feat: There is no way the, 优化ES 高级检索排序分页查询 2022-05-03 06:05:20 +08:00
super_liu 24f4c7f7f0 feat: There is no way the, 新增 7天内 更新 新增 ES 接口 2022-05-03 05:58:51 +08:00