 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 |
|
|
Mr.Z
|
4204771472
|
标准预警初次修改~~
|
2021-08-31 14:03:26 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
bb378b56a7
|
新添文本信息接口
|
2021-08-31 14:01:07 +08:00 |
|
|
yanyizhou
|
05a77b34a0
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-31 11:18:09 +08:00 |
|
|
yuezhihang
|
1ef143e71f
|
标准查询 标准号/标准姓名 ！！！
|
2021-08-31 10:49:04 +08:00 |
|
|
yuezhihang
|
fdd7fe18c0
|
清单查询失效问题
|
2021-08-31 10:29:29 +08:00 |
|
|
yanyizhou
|
e706eaea22
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-30 18:07:00 +08:00 |
|
|
yanyizhou
|
1739a3d555
|
标准预警--加筛选条件 优化了代码（之前查询条件只有一个，所以传的string，现在有很多个，所以传了一个bean，我就把之前传的string那部分代码删了）希望人没事
|
2021-08-30 18:06:47 +08:00 |
|
|
yanyizhou
|
de17b97ad9
|
标准预警--加筛选条件
|
2021-08-30 17:56:27 +08:00 |
|
|
yuezhihang
|
7ad71e5e6a
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-30 17:50:50 +08:00 |
|
|
yuezhihang
|
900437039d
|
项目清单确认流程
|
2021-08-30 17:50:45 +08:00 |
|
|
super_liu
|
770b0b1b8a
|
feat: There is no way the
|
2021-08-30 16:46:03 +08:00 |
|
|
super_liu
|
74fd462657
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the
See merge request !141
|
2021-08-30 08:25:31 +00:00 |
|
|
super_liu
|
455b58fffb
|
feat: There is no way the
|
2021-08-30 16:21:17 +08:00 |
|
|
yanyizhou
|
00a19e76ba
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-30 15:26:10 +08:00 |
|
|
yanyizhou
|
e443ee6164
|
标准合规评估结果--技术评估结果 查看里面的查询条件更改为标准号/标准名称和具体章条
|
2021-08-30 15:25:54 +08:00 |
|
|
super_liu
|
1312813fca
|
Merge branch 'develop_migration' into 'develop_master'
Develop migration
See merge request !140
|
2021-08-30 07:11:47 +00:00 |
|
|
super_liu
|
a57693fd39
|
Merge branch 'develop_master' into develop_migration
|
2021-08-30 15:11:00 +08:00 |
|
|
super_liu
|
99c32a2d7f
|
feat: There is no way the convert
|
2021-08-30 15:08:55 +08:00 |
|
|
super_liu
|
73885d444e
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !139
|
2021-08-30 04:42:48 +00:00 |
|
|
yanyizhou
|
b7ccbbfc45
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-30 10:34:17 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
f53cdd885b
|
更新定时任务时间
|
2021-08-30 10:03:03 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
56e62ac041
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-08-30 09:56:54 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2fb1faacfa
|
标准预警,标准文本状态自动更新
|
2021-08-30 09:48:35 +08:00 |
|
|
yanyizhou
|
88cb99ad9b
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-30 09:05:14 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
913fc6e8f5
|
国内外标准详情 分解单日期格式和条款名称模糊查询
|
2021-08-29 19:17:41 +08:00 |
|
|
super_liu
|
4c6cffa061
|
Merge branch 'develop_migration' into 'develop_master'
Develop migration
See merge request !138
|
2021-08-27 10:02:01 +00:00 |
|
|
super_liu
|
dd2fccc289
|
Merge branch 'develop_master' into develop_migration
|
2021-08-27 18:01:18 +08:00 |
|
|
super_liu
|
d679b48299
|
feat: There is no way the linux convert path
|
2021-08-27 18:00:24 +08:00 |
|
|
yuezhihang
|
46978c9fdb
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-27 17:44:02 +08:00 |
|
|
yuezhihang
|
75888c8fa0
|
首页 结束时间正序
|
2021-08-27 17:43:56 +08:00 |
|
|
Mr.Z
|
af428949a8
|
之前被覆盖的修改二次提交(；′⌒`)~~
|
2021-08-27 17:33:06 +08:00 |
|
|
yanyizhou
|
1b38560d9f
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-27 16:32:00 +08:00 |
|
|
super_liu
|
0b75b7cea5
|
Merge branch 'develop_migration' into 'develop_master'
Develop migration
See merge request !137
|
2021-08-27 08:20:06 +00:00 |
|
|
super_liu
|
7155dea894
|
Merge branch 'develop_master' into develop_migration
|
2021-08-27 16:18:54 +08:00 |
|