FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
508 Commits 1 Branch 0 Tags
21b31580706acffd30b86dab4547bedfbf0f8298
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
super_liu 9b2b0145c0 Merge branch 'develop_3' into 'develop_master' 
最新

See merge request !103
 2021-08-11 01:32:42 +00: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
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
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
super_liu 04f0f1f3f8 feat: There is no way the 2021-08-09 10:21:52 +08:00
super_liu 7a1494484d feat:There is no way the 2021-08-08 16:50:09 +08:00
super_liu 20cc364aa2 feat:There is no way the 2021-08-08 14:18:50 +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
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
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
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
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
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
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
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
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
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
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
super_liu 502e83de9d Merge branch 'develop_3' into 'develop_master' 
feat: 国内外标准 反向标准显示逻辑

See merge request !75
 2021-07-29 16:55:10 +00:00
super_liu 00894cbeef Merge branch 'develop_master' into develop_3 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
 2021-07-30 00:54:34 +08:00
super_liu d7f3fc9f95 feat: 国内外标准 反向标准显示逻辑 2021-07-30 00:48:48 +08:00
super_liu e434216c15 Merge branch 'develop_3' into 'develop_master' 
feat:     exist=false 国家属性字段

See merge request !69
 2021-07-28 08:18:47 +00:00
super_liu 474fe6fd45 feat: exist=false 国家属性字段 2021-07-28 16:18:17 +08:00
super_liu 31a14da9db Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !68
 2021-07-28 08:16:16 +00:00
super_liu c9484a822f Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-07-28 16:15:07 +08:00
super_liu 0b069efd95 feat: 国内外标准 多文档 操作 及 删除 国家属性字段 2021-07-28 16:14:52 +08:00
super_liu d990c840e4 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !63
 2021-07-27 12:35:22 +00:00
super_liu f0fd398fee feat: 1 2021-07-27 18:25:36 +08:00
super_liu 75445cd9e1 feat: 实施日期格式 2021-07-27 14:30:41 +08:00
super_liu 9ff9bafcbf Merge branch 'develop_3' into 'develop_master' 
feat: 修改updatePersonCollect接口

See merge request !59
 2021-07-27 03:20:17 +00:00
super_liu 22f5ea5eaf feat: 修改updatePersonCollect接口 2021-07-27 11:19:30 +08:00
super_liu 5faa4d23b1 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !58
 2021-07-27 03:08:21 +00:00
super_liu 8fd8a7541b Merge branch 'develop_master' into develop_3 2021-07-27 10:41:10 +08:00
super_liu b5a53bf905 feat: es MQ 全局判断 2021-07-27 10:40:43 +08:00
super_liu 387a97a46c feat: 树查询国内外标准 2021-07-27 09:50:47 +08:00
super_liu ebedd9ee4c feat: 200 2021-07-27 09:31:45 +08:00
super_liu b3cc1704b2 feat: 200M 文件限制 2021-07-27 09:26:09 +08:00
super_liu 93f852fef4 Merge branch 'develop_master' into develop_3 2021-07-27 09:08:54 +08:00
super_liu 6f286d6ca5 Merge branch 'develop_1' into 'develop_master' 
update：清单修改，时间查询

See merge request !57
 2021-07-27 00:58:31 +00:00
super_liu 7e50bf88b0 Merge branch 'develop_master' into develop_3 2021-07-26 18:31:43 +08:00
super_liu 5a8cad6e09 feat: 国内外标准库 2021-07-26 18:30:54 +08:00
super_liu cb48c13635 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !54
 2021-07-26 03:12:53 +00:00
super_liu ccfbc541d5 feat: 企业标准库 迁移2 2021-07-26 11:12:16 +08:00
super_liu d210e218ba feat: 标准属性字段 默认排序 2021-07-26 10:07:55 +08:00
super_liu 923a3505bf Merge branch 'develop_3' into 'develop_master' 
feat: 标准库MQ

See merge request !53
 2021-07-26 01:51:52 +00:00
super_liu 2ba81296da feat: 标准库MQ 2021-07-26 09:51:12 +08:00
super_liu c608e52226 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !52
 2021-07-25 12:50:49 +00:00
super_liu 8a1c2b39c3 Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-07-25 20:44:40 +08:00
super_liu 8a263964f6 feat: 企业标准库 迁移1 2021-07-25 20:41:38 +08:00
super_liu 25528d92a8 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !50
 2021-07-23 08:03:18 +00:00
super_liu f840e2e79d Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !40
 2021-07-21 11:15:31 +00:00
super_liu 7f874329a8 Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-07-21 19:14:36 +08:00
super_liu 4dfb0039ad feat: 迁移企业标准库 国内外标准库 懒加载 树结构 2021-07-21 19:14:22 +08:00
super_liu cfd77fadc3 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !38
 2021-07-21 05:56:30 +00:00
super_liu c695984425 Merge branch 'develop_3' into 'develop_master' 
feat: 首页标准发布

See merge request !37
 2021-07-19 08:30:43 +00:00
super_liu 7db2b79b63 feat: 首页标准发布 2021-07-19 16:29:52 +08:00
super_liu cada0c2239 Merge branch 'develop_3' into 'develop_master' 
feat: 标准库

See merge request !36
 2021-07-19 04:04:16 +00:00
super_liu 21931a9455 feat: 标准库 2021-07-19 12:02:56 +08:00
super_liu e80e585f9e Merge branch 'develop_3' into 'develop_master' 
feat: 标准库

See merge request !35
 2021-07-18 09:11:29 +00:00
super_liu 63181803aa feat: 标准库 2021-07-18 17:10:35 +08:00
super_liu d60dfc5671 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !34
 2021-07-15 10:38:32 +00:00
super_liu 5efce6f2d1 feat: vpps model 添加树结构 2021-07-15 18:37:49 +08:00
super_liu 23e90a822c Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-07-15 17:16:11 +08:00
super_liu 90e701154d Merge branch 'develop_3' into 'develop_master' 
feat: 标准入库流程 带入 逻辑

See merge request !33
 2021-07-15 09:15:45 +00:00
super_liu de97f459fd feat: 标准入库流程 带入 逻辑 2021-07-15 17:14:54 +08:00
super_liu 8aa0d66d0e Merge branch 'develop_3' into 'develop_master' 
feat: 添加企业标准库 接口服务

See merge request !24
 2021-07-13 06:27:51 +00:00
super_liu 9930cbae9b feat: 添加企业标准库 接口服务 2021-07-13 14:25:06 +08:00
super_liu cdf0ecd04e Merge branch 'develop_3' into 'develop_master' 
feat: 标准库 详情 文件类 修改

See merge request !23
 2021-07-12 10:10:37 +00:00
super_liu 51ed1c269d feat: 标准库 详情 文件类 修改 2021-07-12 18:09:24 +08:00
super_liu a160d81c9e Merge branch 'develop_3' into 'develop_master' 
feat: 标准文本信息上传

See merge request !22
 2021-07-12 03:03:37 +00:00
super_liu f41d94bbd9 feat: 标准文本信息上传 2021-07-12 11:02:11 +08:00
super_liu b335387242 Merge branch 'develop_3' into 'develop_master' 
feat: 标准库

See merge request !21
 2021-07-11 07:49:10 +00:00
super_liu 43434a68e0 feat: 标准库 2021-07-11 15:47:02 +08:00
super_liu 4cf827998b Merge branch 'develop_3' into 'develop_master' 
feat: 入库流程 属性字段对应

See merge request !20
 2021-07-10 07:52:58 +00:00
super_liu 48933b44dc feat: 入库流程 属性字段对应 2021-07-10 15:43:35 +08:00
super_liu a535f138d9 Merge branch 'develop_3' into 'develop_master' 
feat: 标准库 体系树形结构等

See merge request !19
 2021-07-09 10:17:43 +00:00
super_liu c06cb07db6 feat: 标准库 体系树形结构等 2021-07-09 18:16:10 +08:00
super_liu 78d87640eb Merge branch 'develop_3' into 'develop_master' 
Develop 3  feat: 标准库 左侧树 相关 配置标准 更新记录相关等

See merge request !18
 2021-07-08 14:59:10 +00:00
super_liu 0842280775 feat: 标准库详情 更新记录 2021-07-08 22:56:50 +08:00
super_liu e067c8ae61 feat: 标准库 左侧树 相关 配置标准 相关等 2021-07-08 22:34:07 +08:00
super_liu 4f7d1648db Merge branch 'develop_3' into 'develop_master' 
feat: 数据字典 树形结构

See merge request !17
 2021-07-08 06:20:39 +00:00