 yuezhihang
|
514bf18667
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-12 14:54:01 +08:00 |
|
|
yuezhihang
|
3c27f20db3
|
修改分解单状态
|
2021-08-12 14:53:54 +08:00 |
|
|
shen_yan_pu
|
57bfe507ef
|
清单导出字段修改
|
2021-08-12 14:27:20 +08:00 |
|
|
shen_yan_pu
|
0ae192be2f
|
修改标准清单的实施日期字段
|
2021-08-12 10:40:17 +08:00 |
|
|
Mr.Z
|
0325b6b7ee
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-12 09:48:53 +08:00 |
|
|
yuezhihang
|
f43ac650e0
|
标准合规评估流程 产品线不显示bug修复
|
2021-08-12 09:29:24 +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
|
ae553d92af
|
Merge branch 'develop_3' into 'develop_master'
feat:There is no way the
See merge request !106
|
2021-08-11 09:51:07 +00:00 |
|
|
super_liu
|
9cdf37713f
|
feat:There is no way the
|
2021-08-11 17:50:25 +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 |
|
|
super_liu
|
b7e9cc3061
|
feat: 新增 convert 转换pdf子项目
|
2021-08-11 17:40:26 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2107728ce8
|
最新
|
2021-08-11 14:42:09 +08: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
|
10c81b533d
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-10 19:19:45 +08:00 |
|
|
yanyizhou
|
3f66b95e94
|
拆分
|
2021-08-10 19:19:29 +08:00 |
|
|
Mr.Z
|
9773e51ef0
|
添加字段条款名称
|
2021-08-10 18:34:16 +08:00 |
|
|
yanyizhou
|
d9eaa9d7b1
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-10 18:15:49 +08:00 |
|
|
yanyizhou
|
b9c6899e55
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-10 18:15:38 +08:00 |
|
|
yuezhihang
|
fb860e347d
|
解读入库
|
2021-08-10 17:57:03 +08:00 |
|
|
Mr.Z
|
5cb1fd52cc
|
分解单字段修改
|
2021-08-10 17:29:07 +08:00 |
|
|
yanyizhou
|
d43443640c
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-10 16:01:41 +08:00 |
|
|
yanyizhou
|
7c74df6030
|
零部件模块
|
2021-08-10 16:00:57 +08:00 |
|
|
super_liu
|
7af19a8dca
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-10 14:56:55 +08:00 |
|
|
super_liu
|
8ccbd447be
|
feat:There is no way the
|
2021-08-10 14:55:53 +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 |
|
|
super_liu
|
faac8f3683
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-09 17:32:22 +08:00 |
|
|
super_liu
|
9c32571868
|
feat:There is no way the
|
2021-08-09 17:31:32 +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 |
|
|
yuezhihang
|
11ef32d698
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-08-08 17:37:45 +08:00 |
|
|
Mr.Z
|
6058cc036c
|
标准合规评估结果-技术评估结果 回显不正确
|
2021-08-08 14:04:29 +08:00 |
|
|
super_liu
|
c61eb36afb
|
feat: There is no way the
|
2021-08-08 13:13:06 +08:00 |
|
|
super_liu
|
4147bb8dea
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-08 12:55:07 +08:00 |
|
|
super_liu
|
ea90e4c15e
|
feat: There is no way the
|
2021-08-08 12:54:32 +08:00 |
|
|
王夏晖
|
b989b6c7a3
|
Merge branch 'develop_1' into 'develop_master'
Develop 1
See merge request !96
|
2021-08-08 03:02:43 +00:00 |
|
|
yanyizhou
|
8bc6f85a56
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-08 10:39:12 +08:00 |
|
|
yanyizhou
|
9f4bbd2eb6
|
修复了车型项目库标准删除不是关联标准id和项目id删除而是直接按照标准id删除标准的bug
|
2021-08-08 10:17:38 +08:00 |
|