 yuezhihang
|
08853080db
|
未符合项整改 -新增和修改
|
2021-11-25 17:24:45 +08:00 |
|
|
yuezhihang
|
6178ba696c
|
ocr按钮 和 拆分按钮 提供数据接口 修改
|
2021-11-24 11:50:17 +08:00 |
|
|
yuezhihang
|
3c46d1f88d
|
11.24 异步操作添加 导出字段删除 查询修改
|
2021-11-24 10:55:35 +08:00 |
|
|
王夏晖
|
36c91409fa
|
Merge branch 'develop_3' into 'develop_master'
commit
See merge request LiuChao/foton-slrs-system-rest!248
|
2021-11-23 21:40:38 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
3c7e00b1d5
|
commit
|
2021-11-23 21:29:09 +08:00 |
|
|
super_liu
|
e1ee94ad1a
|
Merge branch 'develop_3' into 'develop_master'
当文件被拆分后才在详情显示分解单按钮,取消拆分后自动导入分解单
See merge request LiuChao/foton-slrs-system-rest!247
|
2021-11-23 21:06:34 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
9fcb1aa84f
|
commit
|
2021-11-23 20:54:12 +08:00 |
|
|
yuezhihang
|
0f8bc78441
|
查询代办的新接口 目前只有标准号 标准名称 和 标准类型 的查询
|
2021-11-23 17:02:16 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
79f0dd6c90
|
当文件被拆分后才在详情显示分解单按钮,取消拆分后自动导入分解单
|
2021-11-23 16:33:49 +08:00 |
|
|
yuezhihang
|
32fc6eb43a
|
风险程度 修改接口 目前是根据数据批量修改 重点是时间 因为时间能保持数据的唯一性
|
2021-11-23 14:46:47 +08:00 |
|
|
yuezhihang
|
ce7a6656b4
|
新增风险程度字段
|
2021-11-23 13:49:44 +08:00 |
|
|
yuezhihang
|
48bde6960b
|
解决比对标准名称和标准号不回显问题
|
2021-11-23 10:46:54 +08:00 |
|
|
yuezhihang
|
804a946717
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-23 09:48:19 +08:00 |
|
|
yuezhihang
|
3474649cd5
|
ocr新按钮查询
|
2021-11-23 09:48:09 +08:00 |
|
|
super_liu
|
65391b493f
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,
See merge request LiuChao/foton-slrs-system-rest!246
|
2021-11-22 22:58:19 +08:00 |
|
|
Superman_Main
|
90f15e4401
|
feat: There is no way the,
|
2021-11-22 22:57:43 +08:00 |
|
|
super_liu
|
75619ee182
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,
See merge request LiuChao/foton-slrs-system-rest!245
|
2021-11-22 22:26:39 +08:00 |
|
|
super_liu
|
a8f0c4977c
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!244
|
2021-11-22 22:26:13 +08:00 |
|
|
Superman_Main
|
8985e3e472
|
feat: There is no way the,
|
2021-11-22 22:25:24 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
3b3f59eb26
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-11-22 16:20:47 +08:00 |
|
|
yuezhihang
|
f08ffeb475
|
方法提取
|
2021-11-22 13:44:20 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b6d74b3f57
|
commit
|
2021-11-22 10:53:47 +08:00 |
|
|
yuezhihang
|
7a5787d0ad
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-22 09:26:40 +08:00 |
|
|
yuezhihang
|
7e6ee28c2e
|
预警查询
|
2021-11-22 09:26:27 +08:00 |
|
|
super_liu
|
ad4b9c0998
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!241
|
2021-11-21 20:34:02 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
44ce02810a
|
详情,标准分解单关联条款
|
2021-11-21 16:12:46 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ed94475d72
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-11-21 11:25:02 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
723569fbd7
|
标准类别排序相同顺序按名称排序
|
2021-11-21 10:21:25 +08:00 |
|
|
yuezhihang
|
8572e2a650
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-19 16:51:21 +08:00 |
|
|
yuezhihang
|
d23f7478ae
|
产品线新增查询条件 以及bug修复
|
2021-11-19 16:51:10 +08:00 |
|
|
super_liu
|
3121c1be9a
|
Merge branch 'develop_migration' into 'develop_master'
Develop migration
See merge request LiuChao/foton-slrs-system-rest!240
|
2021-11-19 14:54:25 +08:00 |
|
|
Superman_Main
|
04aa88fffa
|
feat: There is no way the,
|
2021-11-19 14:53:21 +08:00 |
|
|
Superman_Main
|
6729d40996
|
Merge branch 'develop_master' into develop_migration
|
2021-11-19 14:34:21 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
bd0ace0fcb
|
Merge branch 'develop_master' into develop_3
|
2021-11-19 14:29:43 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
7f620c68f6
|
政策重点认证事业部 风险项入库
|
2021-11-19 14:25:59 +08:00 |
|
|
yuezhihang
|
7017dff372
|
Merge remote-tracking branch 'origin/origin/Three' into develop_master
|
2021-11-19 13:54:14 +08:00 |
|
|
yuezhihang
|
35591e8e86
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-19 13:54:07 +08:00 |
|
|
yuezhihang
|
0f704dde0a
|
Merge remote-tracking branch 'origin/origin/Three' into develop_master
|
2021-11-19 13:43:23 +08:00 |
|
|
2510220824
|
4894c59ebd
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-19 11:20:50 +08:00 |
|
|
liao
|
5abbc7edd9
|
~
|
2021-11-19 11:19:42 +08:00 |
|
|
2510220824
|
9dc1eca724
|
update:文档拆分图片存储路径入配置文件
|
2021-11-19 11:19:11 +08:00 |
|
|
yuezhihang
|
c260cd5533
|
清单查询数据报错bug修复
|
2021-11-18 16:17:27 +08:00 |
|
|
yuezhihang
|
7485c04801
|
下载程序异常
|
2021-11-18 15:52:03 +08:00 |
|
|
Superman_Main
|
9e43e3a7c5
|
feat: There is no way the,
|
2021-11-18 14:49:48 +08:00 |
|
|
Kevin
|
71a686b92b
|
zcr:数据信息统计表- +注释
|
2021-11-18 11:22:01 +08:00 |
|
|
liao
|
3ae99e744b
|
Merge remote-tracking branch 'origin/origin/Three' into origin/Three
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java
|
2021-11-18 11:15:08 +08:00 |
|
|
liao
|
6f1161e89e
|
~
|
2021-11-18 11:14:34 +08:00 |
|
|
yuezhihang
|
96c6202d61
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-18 10:23:39 +08:00 |
|
|
super_liu
|
925512269f
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,
See merge request LiuChao/foton-slrs-system-rest!239
|
2021-11-17 17:26:31 +08:00 |
|
|
Superman_Main
|
c221064c4c
|
feat: There is no way the,
|
2021-11-17 17:25:28 +08:00 |
|