 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 |
|
|
zhaokaiyao@91isoft.com
|
68d7a1ab66
|
添加了注释
|
2021-08-16 16:16:37 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
1acf15280e
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-08-16 16:13:17 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
32626f3ae1
|
过内外标准高级搜索
|
2021-08-16 16:13:04 +08:00 |
|
|
super_liu
|
a5ae69996d
|
feat: There is no way the Search Add Stand ES
|
2021-08-16 13:56:49 +08:00 |
|
|
super_liu
|
8b74f8bb24
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-08-13 15:44:41 +08:00 |
|
|
super_liu
|
fbf1d49065
|
feat: There is no way the
|
2021-08-13 15:43:49 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
0142c3fe85
|
国内外标准排序
|
2021-08-13 13:48:42 +08:00 |
|
|
super_liu
|
9cdf37713f
|
feat:There is no way the
|
2021-08-11 17:50:25 +08: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 |
|
|
zhaokaiyao@91isoft.com
|
530a6febf6
|
查看分解单字段修改
|
2021-08-11 13:36:50 +08:00 |
|
|
yuezhihang
|
fb860e347d
|
解读入库
|
2021-08-10 17:57:03 +08:00 |
|
|
Mr.Z
|
5cb1fd52cc
|
分解单字段修改
|
2021-08-10 17:29:07 +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 |
|
|
Mr.Z
|
29240d6db5
|
标准法规清单，点击导出，导出数据中“标准编号”字段改为“标准号",标准号格式错误
|
2021-08-06 15:20:18 +08:00 |
|
|
yuezhihang
|
3df07924e8
|
标准解读流程 over！
|
2021-08-06 14:07:22 +08:00 |
|
|
yanyizhou
|
f4f5e952f6
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-06 13:44:56 +08:00 |
|
|
yanyizhou
|
a641acfcc5
|
修复了车型项目库标准删除不是关联标准id和项目id删除而是直接按照标准id删除标准的bug
|
2021-08-06 13:43:42 +08:00 |
|
|
yuezhihang
|
82b72b191d
|
解读入库
|
2021-08-05 14:51:45 +08:00 |
|
|
yuezhihang
|
a2bd01dd5e
|
标准解读流程入库+ 合并分支
|
2021-08-05 09:05:30 +08:00 |
|
|
Mr.Z
|
6eb0ed526e
|
标准法规清单，点击导出，导出数据中“标准编号”字段改为“标准号",标准号格式错误
|
2021-08-04 20:09:44 +08:00 |
|
|
Mr.Z
|
967cdeab35
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-04 15:15:55 +08:00 |
|
|
yanyizhou
|
b7f1016135
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-04 09:58:36 +08:00 |
|
|
super_liu
|
1e1be015fe
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !89
|
2021-08-03 07:50:29 +00:00 |
|
|
Mr.Z
|
4993e03aa1
|
未符合项整改，标准号/标准名称查询错误
|
2021-08-03 15:49:34 +08:00 |
|
|
super_liu
|
17ba48200c
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-08-03 15:39:36 +08:00 |
|
|
super_liu
|
d46dbd5229
|
feat: 搜索中心 es 入库 国内外标准修改
|
2021-08-03 15:39:12 +08:00 |
|