 super_liu
|
2f0c627d88
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-08-11 17:20:48 +08:00 |
|
|
super_liu
|
e93edf3bbb
|
feat: 新增 convert 转换pdf子项目
|
2021-08-11 17:19:57 +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
|
21b3158070
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-08-11 13:56:08 +08:00 |
|
|
王夏晖
|
79ca8606f7
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !104
|
2021-08-11 05:46:41 +00:00 |
|
|
yuezhihang
|
def09cd38a
|
标准总数返回
！！！！！
|
2021-08-11 13:39:25 +08:00 |
|
|
yuezhihang
|
adb039fa98
|
过滤数据！！！
|
2021-08-11 13:39:20 +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 |
|
|
super_liu
|
9b2b0145c0
|
Merge branch 'develop_3' into 'develop_master'
最新
See merge request !103
|
2021-08-11 01:32:42 +00:00 |
|
|
zhaokaiyao@91isoft.com
|
8a11249b07
|
最新
|
2021-08-10 20:21:22 +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 |
|
|
yuezhihang
|
90c39fab34
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-08-10 17:44:56 +08:00 |
|
|
yanyizhou
|
9af7f462f5
|
Merge remote-tracking branch 'origin/master' into develop_1
# Conflicts:
# adc-da-main/src/main/resources/application-dev.properties
|
2021-08-10 17:29:51 +08:00 |
|
|
Mr.Z
|
5cb1fd52cc
|
分解单字段修改
|
2021-08-10 17:29:07 +08:00 |
|
|
super_liu
|
271e8860d6
|
feat:There is no way the issueTime sort desc
|
2021-08-10 17:23:00 +08:00 |
|
|
super_liu
|
6c351c1d33
|
feat:There is no way the
|
2021-08-10 16:29:42 +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
|
07496aff43
|
Merge branch 'develop_3' into 'develop_master'
feat:111
See merge request !102
|
2021-08-09 09:42:50 +00:00 |
|
|
super_liu
|
aa76b93e5c
|
feat:111
|
2021-08-09 17:41:48 +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 |
|
|
super_liu
|
04f0f1f3f8
|
feat: There is no way the
|
2021-08-09 10:21:52 +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 |
|
|
yuezhihang
|
313251dbbd
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-08 17:37:33 +08:00 |
|
|
super_liu
|
7a1494484d
|
feat:There is no way the
|
2021-08-08 16:50:09 +08:00 |
|
|
yuezhihang
|
79113cd47a
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-08-08 15:44:08 +08:00 |
|
|
super_liu
|
20cc364aa2
|
feat:There is no way the
|
2021-08-08 14:18:50 +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 |
|