FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
463 Commits 1 Branch 0 Tags
8bc6f85a56f844d9c5f4887e6c5690ccec573e4e
Commit Graph
463 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mr.Z 29240d6db5 标准法规清单，点击导出，导出数据中“标准编号”字段改为“标准号",标准号格式错误 2021-08-06 15:20:18 +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
super_liu 997543fcae feat: 搜索中心 动态字段自动匹配es查询 2021-08-04 18:05:34 +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 6f97155865 Merge branch 'develop_3' into 'develop_master' 
feat: 搜索中心 子项目 添加 相关依赖文件 及 修改

See merge request !90
 2021-08-03 09:52:43 +00:00
super_liu 3a19c44991 feat: 搜索中心 子项目 添加 相关依赖文件 及 修改 2021-08-03 17:52:08 +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
王夏晖 2344ccfda2 Update application-dev.properties 2021-08-02 05:40:33 +00:00
王夏晖 4148f1bf6b Update application.properties 2021-08-02 05:38:46 +00: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
yuezhihang a3729263a8 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-30 18:02:22 +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
王夏晖 0cbc935da1 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !85
 2021-07-30 09:19:22 +00: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