FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
850 Commits 1 Branch 0 Tags
cee53b3df00ad8ca6f2dd17a6fb3ffa0a2575355
Commit Graph
850 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhaokaiyao@91isoft.com cee53b3df0 commit 2021-09-04 22:32:14 +08:00
zhaokaiyao@91isoft.com 75ef2d52bc 文本状态更新被代替,废止根据代替标准号 2021-09-04 22:29:15 +08:00
zhaokaiyao@91isoft.com 3146a6752d Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-04 16:44:31 +08:00
zhaokaiyao@91isoft.com 0ed76406b2 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-04 16:44:20 +08:00
yuezhihang 92207379fc Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-04 16:43:36 +08:00
yuezhihang b5414c7bf1 老数据 读取 2021-09-04 16:43:27 +08:00
zhaokaiyao@91isoft.com 2e83db6d98 文本状态更新被代替,废止 2021-09-04 15:07:15 +08:00
zhaokaiyao@91isoft.com 28e8ba6c88 企标导出excl 标准状态->文本状态 2021-09-04 10:16:19 +08:00
zhaokaiyao@91isoft.com 19c52a212b 解决企标高级搜索,putTime,issuTime,textStatusBuss失效的问题 2021-09-04 10:09:40 +08:00
zhaokaiyao@91isoft.com da7826f004 企标excl导出 日期出现异常 2021-09-04 10:07:44 +08:00
王夏晖 e405a811b8 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!150
 2021-09-04 09:50:49 +08:00
yuezhihang 8ce701cc82 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-09-03 09:24:42 +08:00
zhaokaiyao@91isoft.com fcc74a17dc save sar_stand_project_team 2021-09-03 09:12:58 +08:00
yanyizhou 0b97292bca 实现 /api/sarStandProjectLibrary/save 接口 2021-09-02 22:55:43 +08:00
yanyizhou 42491993a6 Merge remote-tracking branch 'origin/develop_3' into develop_1 2021-09-02 21:22:45 +08:00
zhaokaiyao@91isoft.com 4acf662b1a Merge remote-tracking branch 'origin/develop_1' into develop_3 2021-09-02 21:21:25 +08:00
yanyizhou 1033aecfa4 Merge remote-tracking branch 'origin/develop_3' into develop_1 2021-09-02 21:20:45 +08:00
yanyizhou b72ed741f0 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-09-02 21:20:16 +08:00
zhaokaiyao@91isoft.com 9251c7a28b Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-02 21:07:17 +08:00
zhaokaiyao@91isoft.com e8dd9f42cb save sar_stand_project_team 2021-09-02 21:06:40 +08:00
yuezhihang ae1c70b140 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-09-02 17:31:44 +08:00
Mr.Z 0e8238267c 车型项目库的清单版本~~ 2021-09-02 17:29:19 +08:00
super_liu 93795007e7 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request !146
 2021-09-02 08:58:05 +00:00
super_liu a8158890c1 Merge branch 'develop_master' into develop_migration 2021-09-02 16:57:24 +08:00
super_liu a94b3bea68 feat: There is no way the 2021-09-02 16:54:04 +08:00
Mr.Z 7d0c3a3a9a Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-09-02 16:49:29 +08:00
yuezhihang 5c246ba9b4 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-02 16:44:15 +08:00
super_liu 18cda2c469 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !145
 2021-09-02 08:43:02 +00:00
yuezhihang 5fdf3fa9ae Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-09-02 16:30:12 +08:00
super_liu 46a85a54ae Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the

See merge request !144
 2021-09-02 07:23:45 +00:00
super_liu f8de6d895f feat: There is no way the 2021-09-02 15:21:45 +08:00
zhaokaiyao@91isoft.com cb2090fc44 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-09-02 10:45:27 +08:00
zhaokaiyao@91isoft.com 3d5abafdb0 查询文本信息2.0 2021-09-02 10:43:11 +08:00
Mr.Z 2e6edf615b 标准预警修改~~ 2021-09-02 10:17:28 +08:00
yuezhihang 0e4d7b6a32 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-09-02 09:36:04 +08:00
super_liu 2ec116944c feat: There is no way the ocr handle url 2021-09-01 17:01:19 +08:00
yanyizhou ee85f48542 开耀和宇欢冲突之后的合并代码 2021-09-01 14:25:16 +08:00
yanyizhou fc608845d8 Merge remote-tracking branch 'origin/develop_master' into develop_1 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
 2021-09-01 11:19:57 +08:00
yanyizhou e86f5cfbe7 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-09-01 11:12:29 +08:00
super_liu 9f7f95431c Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !143
 2021-09-01 02:58:01 +00:00
zhaokaiyao@91isoft.com c60ba3c14e Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-08-31 21:39:44 +08:00
zhaokaiyao@91isoft.com f48869a1d5 标准预警,判断标准在产车实施日期和新车型实施日期是否在预警期限内 2021-08-31 21:39:18 +08:00
super_liu ea473ee500 feat: There is no way the ocr 2021-08-31 18:02:50 +08:00
super_liu 41bef317c7 feat: There is no way the 2021-08-31 16:43:41 +08:00
super_liu 431acef2b1 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-31 16:40:43 +08:00
super_liu a1505cb120 feat: There is no way the convert 2021-08-31 16:40:29 +08:00
yuezhihang 4277e819f2 因排序导致无法去重 2021-08-31 16:12:29 +08:00
zhaokaiyao@91isoft.com a843354794 预警标准时设itemsId为'-1' 
更改唯一性约束
 2021-08-31 14:47:54 +08:00
zhaokaiyao@91isoft.com 8040cc0711 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-08-31 14:04:42 +08:00
zhaokaiyao@91isoft.com 02dc65167e 对实施日期进行预警.更新对条款的预警,加入使用车型和责任工程师 2021-08-31 14:04:28 +08:00