 super_liu
|
6084f51bae
|
feat: There is no way the
|
2021-08-24 09:57:11 +08:00 |
|
|
Mr.Z
|
d94b03b05a
|
车型项目库回显bug(T_T)~~~~
|
2021-08-23 14:46:09 +08:00 |
|
|
yanyizhou
|
67dc9c829a
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-23 09:47:05 +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 |
|
|
zhaokaiyao@91isoft.com
|
ebfde8bd52
|
定时标准预警
|
2021-08-20 14:33:29 +08:00 |
|
|
super_liu
|
d176d93d6b
|
feat: There is no way the Buss and Convert
|
2021-08-20 14:07:37 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
01d0da14e8
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
# adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
|
2021-08-18 16:42:28 +08:00 |
|
|
super_liu
|
5251cfdb71
|
Merge branch 'develop_master' into develop_3
|
2021-08-18 14:00:03 +08:00 |
|
|
super_liu
|
5767a26a6a
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-08-18 13:57:48 +08:00 |
|
|
super_liu
|
8e0e632c35
|
feat: There is no way the
|
2021-08-18 13:46:11 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
e6908fb48c
|
标准分解单 分页
|
2021-08-17 14:09:06 +08:00 |
|
|
super_liu
|
ecde4434dd
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !113
|
2021-08-17 02:48:55 +00:00 |
|
|
zhaokaiyao@91isoft.com
|
32626f3ae1
|
过内外标准高级搜索
|
2021-08-16 16:13:04 +08:00 |
|
|
yuezhihang
|
99d5706184
|
解读入库
|
2021-08-16 14:57:34 +08:00 |
|
|
yuezhihang
|
44a24c23b1
|
项目维度 筛选标准
|
2021-08-13 18:28:28 +08:00 |
|
|
yuezhihang
|
699b1ef9c4
|
车型项目库查询bug
|
2021-08-13 16:44:09 +08:00 |
|
|
yuezhihang
|
3327223c25
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-08-13 09:06:16 +08:00 |
|
|
yuezhihang
|
9f0ed13874
|
合规评估项目数据过滤
|
2021-08-12 18:08:29 +08:00 |
|
|
yuezhihang
|
5254f397b8
|
项目评估流程
|
2021-08-12 18:00:46 +08:00 |
|
|
yuezhihang
|
7d4dcf561a
|
查询总数 错误bug
|
2021-08-12 16:22:36 +08:00 |
|
|
shen_yan_pu
|
0ae192be2f
|
修改标准清单的实施日期字段
|
2021-08-12 10:40:17 +08:00 |
|
|
yuezhihang
|
0326e66b54
|
启动bug修复
|
2021-08-12 09:13:06 +08:00 |
|
|
yuezhihang
|
cdf9e16f1d
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-12 09:06:22 +08:00 |
|
|
Mr.Z
|
db5ea125fb
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-11 23:06:47 +08:00 |
|
|
Mr.Z
|
1374bc5807
|
zyh自用
|
2021-08-11 23:03:40 +08:00 |
|
|
super_liu
|
dfc86922f2
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !105
|
2021-08-11 09:42:05 +00:00 |
|
|
yuezhihang
|
440bb7d038
|
标准总数返回
！！！！！
|
2021-08-11 14:23:49 +08:00 |
|
|
yuezhihang
|
8c92abab31
|
过滤数据！！！
|
2021-08-11 14:23:49 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
530a6febf6
|
查看分解单字段修改
|
2021-08-11 13:36:50 +08:00 |
|
|
2510220824
|
13d51ae2a1
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-11 13:34:29 +08:00 |
|
|
2510220824
|
b14a80c7a4
|
add:新增同步车型项目，组织数据接口
|
2021-08-11 13:33:42 +08:00 |
|
|
yanyizhou
|
3f66b95e94
|
拆分
|
2021-08-10 19:19:29 +08:00 |
|
|
Mr.Z
|
5cb1fd52cc
|
分解单字段修改
|
2021-08-10 17:29:07 +08:00 |
|
|
yuezhihang
|
e52f316a59
|
标准总数返回
！！！！！
|
2021-08-10 14:49:44 +08:00 |
|
|
yuezhihang
|
1218c4633a
|
代码合并
|
2021-08-09 17:58:19 +08:00 |
|
|
yuezhihang
|
ca80dd9feb
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
# Conflicts:
# adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
|
2021-08-09 17:55:11 +08:00 |
|
|
yuezhihang
|
3dd392b411
|
过滤数据！！！
|
2021-08-09 17:52:01 +08:00 |
|
|
王夏晖
|
d7ed47a58f
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !99
|
2021-08-09 09:11:47 +00:00 |
|
|
2510220824
|
4302fed66f
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
# Conflicts:
# adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
|
2021-08-09 17:10:30 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
7a51e1d9b4
|
标准详情->标准分解单查询 mapper<if>字符
|
2021-08-09 16:56:29 +08:00 |
|
|
yuezhihang
|
1b8884fe75
|
车型项目库！
|
2021-08-09 11:07:26 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b0eeb87bd1
|
标准详情->标准分解单查询
|
2021-08-08 22:40:37 +08:00 |
|
|
yanyizhou
|
9f4bbd2eb6
|
修复了车型项目库标准删除不是关联标准id和项目id删除而是直接按照标准id删除标准的bug
|
2021-08-08 10:17:38 +08:00 |
|
|
yuezhihang
|
82b72b191d
|
解读入库
|
2021-08-05 14:51:45 +08:00 |
|