Commit Graph
688 Commits
Author SHA1 Message Date
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
qk 84767315c8 update:修改bug 2022-05-17 09:06:58 +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
yuezhihang e01952afc2 定时任务 根据时间更新 文本状态 2022-05-07 16:29:10 +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
yuezhihang f38b96fc92 查询数据的时候增加 sort判断条件避免数据重复展示 2022-05-05 13:45:02 +08:00
super_liu 3eb8b090e9 feat: There is no way the, AWC LIKE DEL LEFT % 2022-05-05 11:08:07 +08:00
yuezhihang 3f20e9cc17 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-04-29 15:33:41 +08:00
yuezhihang 14f67dda61 数据同步接口 不走es 2022-04-29 14:42:32 +08:00
super_liu 21d0872b26 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!459
2022-04-28 21:24:43 +08:00
super_liu 27a04f7c1b feat: There is no way the, xxxx 2022-04-28 19:37:58 +08:00
super_liu cd1494e16f Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, xxx

See merge request LiuChao/foton-slrs-system-rest!457
2022-04-28 19:13:19 +08:00
super_liu 2bc71ee31c feat: There is no way the, xxx 2022-04-28 19:07:48 +08:00
yuezhihang 44ed3af251 清单导入 2022-04-27 19:11:16 +08:00
super_liu 464b11f47d feat: There is no way the, AWC 系统对完接口 2022-04-26 14:08:21 +08:00
yuezhihang f1e30c3fd5 bug 52667 修复 2022-04-25 13:31:35 +08:00
yuezhihang fb7040d53b 清单修改 使用mq 2022-04-21 16:32:44 +08:00
yuezhihang 51010172f0 国内海外清单 标准的导入导出 2022-04-21 13:13:53 +08:00
yuezhihang 23b6b1e44c 未符合项 查询空格问题修复 2022-04-19 13:49:57 +08:00
super_liu c06ef7a693 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!451
2022-04-14 09:55:50 +08:00
super_liu 4ff24628da feat: There is no way the, 2022-04-14 09:54:53 +08:00
yuezhihang 5a950b7faa 标准比对 以及产品规划部 批量关闭 加导出 2022-04-13 15:23:23 +08:00
yuezhihang f96714b0d2 4-12 审查流程入库页面展示 2022-04-12 17:40:20 +08:00
super_liu 362f82c639 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, bug #52285

See merge request LiuChao/foton-slrs-system-rest!449
2022-04-11 17:37:52 +08:00
super_liu bbaab05b58 feat: There is no way the, bug #52285 2022-04-11 17:36:52 +08:00
yuezhihang c22104afab 审查流程 2022-04-11 16:22:16 +08:00
super_liu 42ae20d88b Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!445
2022-04-06 01:02:21 +08:00
super_liu 9540bb3192 feat: There is no way the, bug #52285 2022-04-06 01:01:33 +08:00
super_liu 57f550c0bf feat: There is no way the, bug #52284 #52278 2022-04-05 20:31:35 +08:00
yuezhihang 41deabd152 专门用来查询存在分解单数据的类型的接口 2022-04-02 16:34:47 +08:00
yuezhihang bcecefc39a 清单高级查询 2022-04-02 14:02:18 +08:00
yuezhihang 8860d789e4 清单部分高级查询 2022-04-02 11:26:09 +08:00
yuezhihang 61d6bff12b 3-29 bug 修复 2022-03-30 09:02:19 +08:00
yuezhihang 845e23d76b 征求意见最新需求 2022-03-28 17:52:10 +08:00
yuezhihang a9d17700d2 企标导出 2022-03-28 14:07:52 +08:00
super_liu 4807ecde20 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!431
2022-03-27 17:30:27 +08:00
super_liu 51a49d194b feat: There is no way the, 2022-03-27 17:29:38 +08:00
super_liu 7902f3ea19 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, xxxxx

See merge request LiuChao/foton-slrs-system-rest!430
2022-03-25 21:23:21 +08:00
super_liu 25a36eff18 feat: There is no way the, xxxxx 2022-03-25 21:22:14 +08:00
super_liu a9c0d8bb1c Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!423
2022-03-24 22:56:51 +08:00
super_liu 309b59405c feat: There is no way the, 导出优化 字段维护 2022-03-24 18:21:29 +08:00
super_liu c4a7cad347 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, BUG #51976

See merge request LiuChao/foton-slrs-system-rest!422
2022-03-24 10:01:46 +08:00
super_liu 7067c45637 feat: There is no way the, BUG #51976 2022-03-24 09:56:27 +08:00
yuezhihang 4ace839e1f 加了个部门的查询条件 2022-03-23 17:46:13 +08:00
yuezhihang 461caf2105 角色管理查看人员增加部门显示-后台代码 2022-03-23 17:40:11 +08:00
11528 ad61fcf381 Merge remote-tracking branch 'origin/develop_master' into develop_master
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
2022-03-18 16:41:16 +08:00