 Mr.Z
|
cf60309f2b
|
标准预警标准编号与名称跳页~~
|
2021-08-27 11:26:32 +08:00 |
|
|
Mr.Z
|
05994c6014
|
标准预警标准编号与名称跳页~~
|
2021-08-27 11:24:27 +08:00 |
|
|
Mr.Z
|
07bd24b7cf
|
标准拆分的批量删除与编辑~~
|
2021-08-26 20:44:51 +08:00 |
|
|
Mr.Z
|
4eb9e91554
|
Merge branch 'develop_master' into develop_1
|
2021-08-26 11:15:54 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
bab79aec98
|
定时时间
|
2021-08-26 10:32:47 +08:00 |
|
|
Mr.Z
|
6ada02e26d
|
Merge branch 'develop_master' into develop_1
|
2021-08-26 10:27:59 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
6e0091f875
|
标准预警
|
2021-08-26 10:23:02 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
426ff38355
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-08-26 10:22:15 +08:00 |
|
|
yanyizhou
|
dbac199130
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-25 17:03:28 +08:00 |
|
|
yanyizhou
|
51055e0374
|
不一致项 查询 加standType
|
2021-08-25 17:02:59 +08:00 |
|
|
super_liu
|
b2884bac9d
|
feat: There is no way the delResourceById
|
2021-08-25 15:23:55 +08:00 |
|
|
yanyizhou
|
fe25f43063
|
合并代码冲突
|
2021-08-25 15:17:55 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
a5ad8077d4
|
注释
|
2021-08-25 14:24:42 +08:00 |
|
|
yanyizhou
|
a3c056cbbf
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
|
2021-08-25 13:36:49 +08:00 |
|
|
super_liu
|
98e930868a
|
Merge branch 'develop_migration' into 'develop_master'
Develop migration
See merge request !131
|
2021-08-24 09:32:42 +00:00 |
|
|
super_liu
|
94612430d1
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !130
|
2021-08-24 09:32:13 +00:00 |
|
|
super_liu
|
590165a3c8
|
Merge branch 'develop_master' into develop_migration
|
2021-08-24 17:31:22 +08:00 |
|
|
super_liu
|
02a8b6c969
|
feat: There is no way the ES BUSS
|
2021-08-24 17:29:53 +08:00 |
|
|
yuezhihang
|
65a7e634d4
|
分界单进入之前先删除
|
2021-08-24 17:14:20 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d5d885651b
|
新增自定义属性后,重新加载数据
|
2021-08-24 16:44:37 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
14b4a2f35c
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-08-24 16:03:08 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
1e2c09a610
|
预警显示的数据在系统日期之后
|
2021-08-24 16:02:18 +08:00 |
|
|
yuezhihang
|
78dbd37f03
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
|
2021-08-24 15:34:27 +08:00 |
|
|
Mr.Z
|
c65edcbaab
|
成球意见详情导出格式bug修改~~
|
2021-08-24 15:30:43 +08:00 |
|
|
yanyizhou
|
0d5f369597
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-24 13:52:10 +08:00 |
|
|
super_liu
|
a971d3bcf7
|
feat: There is no way the
|
2021-08-24 13:40:45 +08:00 |
|
|
Mr.Z
|
3d9952df59
|
Merge branch 'develop_master' into develop_1
|
2021-08-24 11:05:07 +08:00 |
|
|
Mr.Z
|
6e9cf7adf4
|
车型项目库数据传递bug修改~~
|
2021-08-24 11:01:32 +08:00 |
|
|
super_liu
|
0c8fb2b03f
|
feat: There is no way the
|
2021-08-24 10:09:07 +08:00 |
|
|
super_liu
|
6084f51bae
|
feat: There is no way the
|
2021-08-24 09:57:11 +08:00 |
|
|
super_liu
|
4a11cd9c9b
|
Merge branch 'develop_master' into develop_migration
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
|
2021-08-23 17:55:37 +08:00 |
|
|
super_liu
|
316fde8563
|
feat: There is no way the Buss advanced query
|
2021-08-23 17:48:44 +08:00 |
|
|
yanyizhou
|
6f06ed7157
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-23 15:55:03 +08:00 |
|
|
yanyizhou
|
b17409a7ae
|
项目评估结果tab页下的查看页面，点击查询按钮，提示程序异常
|
2021-08-23 15:53:56 +08:00 |
|
|
Mr.Z
|
eb264da8f6
|
合并DM到D1~~~~
|
2021-08-23 15:03:04 +08:00 |
|
|
super_liu
|
c2039807da
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the Buss export and delete es index
See merge request !122
|
2021-08-23 06:47:50 +00:00 |
|
|
super_liu
|
74d7f48722
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
赵开耀
See merge request !121
|
2021-08-23 06:47:12 +00:00 |
|
|
super_liu
|
38f4fc3674
|
feat: There is no way the Buss export and delete es index
|
2021-08-23 14:43:58 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
52503aa715
|
解决了newListMethod() 新增标准清单添加标准问题
|
2021-08-23 13:15:52 +08:00 |
|
|
yanyizhou
|
8f53c85efc
|
标准法规清单-国家/地区清单修改提示信息
|
2021-08-23 11:04:25 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
c223de4c32
|
Merge remote-tracking branch 'origin/develop_1' into develop_3
|
2021-08-23 10:59:03 +08:00 |
|
|
yanyizhou
|
67dc9c829a
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-23 09:47:05 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
af0112e2dd
|
latest
|
2021-08-22 20:32:35 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
95e2316a99
|
海外标准法规-假设标准A的国家地区选择中国，国家地区清单tab页下的中国的清单里要自动归档标准A的数据
|
2021-08-21 23:28:54 +08:00 |
|
|
yanyizhou
|
23365ffa16
|
标准拆分，拆分之后分解单里也有数据
|
2021-08-20 21:50:40 +08:00 |
|
|
super_liu
|
a242b9ac56
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the Buss and Convert
See merge request !120
|
2021-08-20 10:12:39 +00:00 |
|
|
super_liu
|
fe89ba9c60
|
feat: There is no way the Buss and Convert
|
2021-08-20 18:12:08 +08:00 |
|
|
yuezhihang
|
e4c66d74a2
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-20 15:20:54 +08:00 |
|
|
yuezhihang
|
dcfedac4bf
|
标准征求意见流程汇总
|
2021-08-20 15:20:33 +08:00 |
|
|
super_liu
|
1363a5b5af
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !119
|
2021-08-20 07:06:16 +00:00 |
|