FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
700 Commits 1 Branch 0 Tags
590165a3c8adae80a6caab943abebf629fc2ba4a
Commit Graph
700 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
2510220824 97cec30f4d Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-24 14:24:40 +08:00
2510220824 5d7f3195e3 add:修改restTemplate配置 2021-08-24 14:24:14 +08:00
super_liu 150e6f8676 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request !129
 2021-08-24 05:43:32 +00:00
super_liu 052222a52f Merge branch 'develop_master' into develop_migration 2021-08-24 13:42:22 +08:00
super_liu a971d3bcf7 feat: There is no way the 2021-08-24 13:40:45 +08:00
super_liu 7423ae7371 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !128
 2021-08-24 05:39:33 +00:00
super_liu ad5a7629b7 Merge branch 'develop_master' into develop_3 2021-08-24 13:38:39 +08:00
super_liu 57a3e082d3 feat: There is no way the 2021-08-24 13:37:36 +08:00
2510220824 f58bbd0c01 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-24 13:32:42 +08:00
2510220824 bf8a247cf2 add:ocr请求替换为okhttp 2021-08-24 13:30:39 +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 fd063ba732 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the

See merge request !126
 2021-08-24 02:09:50 +00:00
super_liu 0c8fb2b03f feat: There is no way the 2021-08-24 10:09:07 +08:00
super_liu 30e540f472 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the

See merge request !125
 2021-08-24 01:59:07 +00:00
super_liu 6084f51bae feat: There is no way the 2021-08-24 09:57:11 +08:00
super_liu 836f62172c Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the Buss  advanced query

See merge request !124
 2021-08-23 09:56:29 +00: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
张宇欢 e92b03a295 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !123
 2021-08-23 07:13:20 +00: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
Mr.Z d94b03b05a 车型项目库回显bug(T_T)~~~~ 2021-08-23 14:46:09 +08:00
super_liu 38f4fc3674 feat: There is no way the Buss export and delete es index 2021-08-23 14:43:58 +08:00
Mr.Z 2b8b536811 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-23 13:37:48 +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 27e72dca2e 征求意见 数据 2021-08-20 17:49:34 +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
super_liu aaa9598735 feat: There is no way the !!! 2021-08-20 15:05:24 +08:00
zhaokaiyao@91isoft.com ebfde8bd52 定时标准预警 2021-08-20 14:33:29 +08:00
super_liu 944df917a3 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request !118
 2021-08-20 06:14:10 +00:00
super_liu c89a90757c Merge branch 'develop_master' into develop_migration 2021-08-20 14:09:13 +08:00