 yuezhihang
|
7e6ee28c2e
|
预警查询
|
2021-11-22 09:26:27 +08:00 |
|
|
Superman_Main
|
0a39e89c8e
|
Merge branch 'develop_master' into FOTON
|
2021-11-21 20:34:31 +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 |
|
|
Superman_Main
|
ed128e1403
|
feat: There is no way the
|
2021-11-20 16:46:00 +08:00 |
|
|
Superman_Main
|
09ebe8f394
|
feat: There is no way the
|
2021-11-20 11:31:26 +08:00 |
|
|
Superman_Main
|
97626172d8
|
Merge branch 'develop_master' into FOTON
|
2021-11-20 11:24:42 +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 |
|
|
2510220824
|
fa76e1eb6c
|
update:更新拆分图片存储位置
|
2021-11-19 15:14:23 +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
|
6ba96a22ea
|
update:新增拆分图片路径配置
|
2021-11-19 11:25:57 +08:00 |
|
|
2510220824
|
da69053af6
|
Merge remote-tracking branch 'origin/develop_master' into FOTON_RELEASE
# Conflicts:
# adc-da-main/src/main/resources/application-dev.properties
|
2021-11-19 11:24:00 +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 |
|
|
2510220824
|
3b03f7a7ea
|
update:修正线上ocr识别文件存储地址
|
2021-11-18 17:27:08 +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 |
|
|
Kevin
|
9c2b5408ea
|
zcr:数据信息统计表
|
2021-11-17 17:18:37 +08:00 |
|
|
super_liu
|
7fd4315ad5
|
Merge branch 'develop_migration' into 'develop_master'
Develop migration
See merge request LiuChao/foton-slrs-system-rest!238
|
2021-11-17 15:25:31 +08:00 |
|
|
Superman_Main
|
6aa402fbce
|
feat: There is no way the,
|
2021-11-17 15:24:15 +08:00 |
|
|
Superman_Main
|
a7c502b0fe
|
feat: There is no way the,
|
2021-11-17 15:09:10 +08:00 |
|
|
yuezhihang
|
f1175010f7
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-11-17 14:04:00 +08:00 |
|
|
yuezhihang
|
216a437e9e
|
Merge remote-tracking branch 'origin/origin/Three' into develop_master
|
2021-11-17 14:03:48 +08:00 |
|
|
super_liu
|
0d324cc6ae
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,
See merge request LiuChao/foton-slrs-system-rest!237
|
2021-11-17 12:00:19 +08:00 |
|
|
Superman_Main
|
464451ab82
|
feat: There is no way the,
|
2021-11-17 11:56:23 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
e1037c73f1
|
政策重点认证事业部 风险项入库
|
2021-11-17 10:36:40 +08:00 |
|
|
liao
|
bca00a0b5d
|
~
|
2021-11-16 17:29:49 +08:00 |
|
|
yuezhihang
|
478cdd4c87
|
新流程的Key
|
2021-11-16 16:59:23 +08:00 |
|
|
liao
|
7e16815b2d
|
~
|
2021-11-16 16:19:56 +08:00 |
|
|
liao
|
11baf7eda5
|
~
|
2021-11-16 14:27:54 +08:00 |
|
|
Kevin
|
a5d0745aa0
|
zcr:数据信息统计表
|
2021-11-16 09:17:06 +08:00 |
|
|
liao
|
303640aa27
|
~
|
2021-11-15 14:35:40 +08:00 |
|