Commit Graph
1470 Commits
Author SHA1 Message Date
wangxiahui@91isoft.com 7e03bc471d Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-05-23 14:37:30 +08:00
wangxiahui@91isoft.com 426728c359 update:用户数据同步修改1.开启定时任务,每天凌晨2点执行 2.已离职用户的数据过滤 2022-05-23 14:37:00 +08:00
super_liu ca07283dd2 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!499
2022-05-19 15:33:03 +08:00
super_liu 16dc1b5d99 feat: There is no way the, 2022-05-19 12:36:43 +08:00
super_liu 65f688b332 feat: There is no way the, 2022-05-19 12:36:09 +08:00
super_liu 8d23ba9162 feat: There is no way the, rest 2022-05-19 10:08:58 +08:00
super_liu 6d64ae63aa feat: There is no way the, bug #52771 去掉重复效验验证 2022-05-19 09:38:39 +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
super_liu 9c5ace8356 feat: There is no way the, TDM 分页外部访问标准接口 2022-05-17 17:52:18 +08:00
qk 84767315c8 update:修改bug 2022-05-17 09:06:58 +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 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
wangxiahui@91isoft.com 4347f9d209 update:awc对接返回访问链接去掉用户信息 2022-05-06 14:55:28 +08:00
super_liu 705c115db3 feat: There is no way the, 优化ES 2022-05-05 17:33:04 +08:00
super_liu 2b1178e289 feat: There is no way the, 优化ES 2022-05-05 17:00:43 +08:00
super_liu f30cea2a9f feat: There is no way the, 2022-05-05 15:08:16 +08:00
super_liu ff6ebc7393 feat: There is no way the, 更新ES 文件ID 默认去掉空格 2022-05-05 14:49:40 +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 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 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 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 24f4c7f7f0 feat: There is no way the, 新增 7天内 更新 新增 ES 接口 2022-05-03 05:58:51 +08:00
super_liu 3f84739d2b Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, xxxx

See merge request LiuChao/foton-slrs-system-rest!477
2022-05-02 16:14:48 +08:00
super_liu bfd1ceef9e feat: There is no way the, xxxx 2022-05-02 16:08:26 +08:00
zj 680f9b8aac Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-05-01 18:50:50 +08:00
zj 8f62184047 doc文檔重新轉換 2022-05-01 18:50:06 +08:00
super_liu 529ece1f95 feat: There is no way the, 优化ES kkkkkkkkkkk 2022-05-01 13:30:54 +08:00
super_liu 415af05e8b feat: There is no way the, 优化ES kkkkkkk 2022-05-01 13:17:17 +08:00
super_liu 99c6348584 feat: There is no way the, 优化ES k 2022-05-01 13:07:57 +08:00
super_liu eee8b90148 feat: There is no way the, 优化ES 坑 2022-05-01 13:01:42 +08:00