 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 |
|
|
yuezhihang
|
9a5117f8e8
|
标准 拆分加文本状态 Map对应的 酌情添加
|
2021-08-03 15:06:20 +08:00 |
|
|
yuezhihang
|
2f12561caf
|
本人意见显示在最上面
|
2021-08-03 14:44:09 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
294866bb1e
|
修复了标准拆分--拆分页面，该页面的数据回显重复的问题
|
2021-08-03 14:28:47 +08:00 |
|
|
yuezhihang
|
6f654406fd
|
征求意见流程-----加按钮判断权限接口
|
2021-08-03 13:56:33 +08:00 |
|
|
super_liu
|
09e4a5a767
|
Merge branch 'develop_3' into 'develop_master'
feat: 国内外标准 编辑入es库 问题修改
See merge request !87
|
2021-08-02 09:47:24 +00:00 |
|
|
super_liu
|
4e398027eb
|
feat: 国内外标准 编辑入es库 问题修改
|
2021-08-02 17:44:16 +08:00 |
|
|
yuezhihang
|
65f7689dbc
|
征求意见修改
|
2021-08-02 15:17:44 +08:00 |
|
|
yuezhihang
|
cf6e3ae601
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-02 13:45:17 +08:00 |
|
|
super_liu
|
b230a49783
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !86
|
2021-08-02 03:07:45 +00:00 |
|
|
super_liu
|
d83c7359da
|
feat: 非国内外标准菜单标准表 添加注解
|
2021-08-02 10:58:59 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
bda7690807
|
最新
|
2021-07-31 22:29:40 +08:00 |
|
|
zzy
|
dd7f18f6d9
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-07-30 17:56:09 +08:00 |
|
|
zzy
|
ed4dd5ae23
|
update：增加字段
|
2021-07-30 17:55:43 +08:00 |
|
|
Wanghong
|
43e37e3d47
|
修改未符合项字段显示bug
|
2021-07-30 17:40:19 +08:00 |
|
|
zzy
|
11b3e9f1c8
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
|
2021-07-30 17:15:36 +08:00 |
|
|
zzy
|
30859dd3af
|
update：develop3
|
2021-07-30 17:08:17 +08:00 |
|
|
super_liu
|
de95dc63ae
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
|
2021-07-30 16:54:36 +08:00 |
|
|
zzy
|
faef2cdf59
|
Update：标准解读流程检索
|
2021-07-30 16:45:23 +08:00 |
|
|
zzy
|
3c68a2a668
|
Merge remote-tracking branch 'origin/develop_3' into develop_1
|
2021-07-30 16:43:39 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d7a2285d75
|
Revert "最新"
This reverts commit 9f82519e
|
2021-07-30 16:26:27 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d71c4a81e1
|
Revert "修复了收藏后重新编辑数据,收藏的数据没有更新问题"
This reverts commit 3154533fb8.
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
|
2021-07-30 16:25:23 +08:00 |
|
|
yuezhihang
|
46a577ab7f
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-07-30 13:43:13 +08:00 |
|