 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 |
|
|
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 |
|
|
yuezhihang
|
32f7678427
|
ky 上传文件类型限制！！！
|
2021-08-08 10:41:26 +08:00 |
|
|
yanyizhou
|
8bc6f85a56
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-08 10:39:12 +08:00 |
|
|
yanyizhou
|
4ea16d31c5
|
岳志航改的bug
|
2021-08-08 10:17:38 +08:00 |
|
|
Mr.Z
|
f8e0ce0be1
|
标准征求意见流程--导出汇总单，修正存在一条数据的情况下，导出的数据应该在excel列表的第二行，目前在第三行
|
2021-08-08 10:17:38 +08:00 |
|
|
yanyizhou
|
9f4bbd2eb6
|
修复了车型项目库标准删除不是关联标准id和项目id删除而是直接按照标准id删除标准的bug
|
2021-08-08 10:17:38 +08:00 |
|
|
super_liu
|
4f6b95a5f2
|
feat: 发版配置文件 不用替换
|
2021-08-07 11:48:08 +08:00 |
|
|
super_liu
|
77bc46b1ba
|
feat:eee
|
2021-08-06 16:24:42 +08:00 |
|
|
super_liu
|
0649d3850a
|
feat:
|
2021-08-06 16:20:31 +08:00 |
|
|
Mr.Z
|
29240d6db5
|
标准法规清单，点击导出，导出数据中“标准编号”字段改为“标准号",标准号格式错误
|
2021-08-06 15:20:18 +08:00 |
|
|
super_liu
|
14a88c5d40
|
Merge branch 'develop_3' into 'develop_master'
feat: 搜索中心 一般检索 es 文本字段修改
See merge request !95
|
2021-08-06 06:22:19 +00:00 |
|
|
super_liu
|
ac2c51bcc1
|
feat: 搜索中心 一般检索 es 文本字段修改
|
2021-08-06 14:21:32 +08:00 |
|
|
yuezhihang
|
b618714246
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-06 14:07:29 +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 |
|
|
super_liu
|
626cf1c25d
|
Merge branch 'develop_3' into 'develop_master'
feat: 搜索中心 添加资源类型 es 检索
See merge request !94
|
2021-08-06 02:30:07 +00:00 |
|
|
super_liu
|
7b1bb28104
|
feat: 搜索中心 添加资源类型 es 检索
|
2021-08-06 10:29:15 +08:00 |
|
|
王夏晖
|
db69ac1f13
|
Update application.properties
|
2021-08-05 09:46:55 +00:00 |
|
|
super_liu
|
b3a46bbabc
|
feat: es
|
2021-08-05 17:18:44 +08:00 |
|
|
super_liu
|
147a67b47f
|
Merge branch 'develop_3' into 'develop_master'
feat: 搜索中心 es 高级检索
See merge request !93
|
2021-08-05 09:13:15 +00:00 |
|
|
super_liu
|
098f6c0166
|
feat: 搜索中心 es 高级检索
|
2021-08-05 16:41:15 +08:00 |
|
|
yuezhihang
|
82b72b191d
|
解读入库
|
2021-08-05 14:51:45 +08:00 |
|
|
Mr.Z
|
19dc409742
|
标准征求意见流程--导出汇总单，修正存在一条数据的情况下，导出的数据应该在excel列表的第二行，目前在第三行
|
2021-08-05 14:01:10 +08:00 |
|
|
yuezhihang
|
78ec0a08c7
|
发版配置更新
|
2021-08-05 09:24:51 +08:00 |
|
|
yuezhihang
|
a2bd01dd5e
|
标准解读流程入库+ 合并分支
|
2021-08-05 09:05:30 +08:00 |
|
|
yuezhihang
|
639dd56700
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-08-05 09:04:09 +08:00 |
|
|
Mr.Z
|
6eb0ed526e
|
标准法规清单，点击导出，导出数据中“标准编号”字段改为“标准号",标准号格式错误
|
2021-08-04 20:09:44 +08:00 |
|
|
super_liu
|
918e5151de
|
Merge branch 'develop_3' into 'develop_master'
feat: 搜索中心 动态字段自动匹配es查询
See merge request !92
|
2021-08-04 10:07:20 +00:00 |
|