FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
640 Commits 1 Branch 0 Tags
ed0909c6ff8fe233236534c6a115f4969ae101db
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
super_liu 7c7be1065c feat: There is no way the WebMvcConfigurer 2021-08-19 11:35:10 +08:00
super_liu c9d0b60863 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-19 11:24:58 +08:00
super_liu 5335230dce feat: There is no way the @CrossOrigin 2021-08-19 11:24:41 +08:00
super_liu bc1a9e8241 feat: There is no way the 2021-08-19 10:38:21 +08:00
super_liu c343a20ae2 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !116
 2021-08-19 02:32:38 +00:00
super_liu 5675671cbf Merge branch 'develop_master' into develop_3 
# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
 2021-08-19 10:31:25 +08:00
super_liu 0aba76276f feat: There is no way the 2021-08-19 10:26:31 +08:00
super_liu bed2c167d9 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-18 16:31:16 +08:00
super_liu 150e2c96d2 feat: There is no way the User Menu auth 2021-08-18 16:30:58 +08:00
super_liu 5251cfdb71 Merge branch 'develop_master' into develop_3 2021-08-18 14:00:03 +08:00
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
super_liu 3906456daa feat: There is no way the auth menu 2021-08-18 13:00:46 +08:00
super_liu bc955be3df Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-18 10:16:48 +08:00
super_liu 8b465f93bf feat: There is no way the 2021-08-18 10:16:32 +08:00
super_liu f7231deef7 feat: There is no way the 2021-08-17 17:36:44 +08:00
super_liu 1791877be5 feat: There is no way the 2021-08-17 15:04:17 +08:00
super_liu ecde4434dd Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !113
 2021-08-17 02:48:55 +00:00
super_liu 8db9e0bccf Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-08-17 10:47:49 +08:00
super_liu dbb69c8676 feat: There is no way the 2021-08-17 10:47:27 +08:00
super_liu 0f202d6e32 Merge branch 'develop_3' into 'develop_master' 
feat: There is no way the Search Add Stand ES

See merge request !112
 2021-08-16 05:57:41 +00:00
super_liu a5ae69996d feat: There is no way the Search Add Stand ES 2021-08-16 13:56:49 +08:00
super_liu 532b343ff2 Merge branch 'develop_3' into 'develop_master' 
feat: There is no way the MQ create queue key

See merge request !111
 2021-08-16 02:48:51 +00:00
super_liu a94f815a96 feat: There is no way the MQ create queue key 2021-08-16 10:45:52 +08:00
super_liu 42f2f67731 Merge branch 'develop_3' into 'develop_master' 
feat: There is no way the

See merge request !110
 2021-08-13 09:10:23 +00:00
super_liu 0f82f405ab feat: There is no way the 2021-08-13 17:08:56 +08:00
super_liu ecb5d3a67e Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !109
 2021-08-13 08:43:49 +00:00
super_liu a412eee2c6 feat: There is no way the 2021-08-13 16:39:59 +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
super_liu 3c2eed2ed4 feat: There is no way the 2021-08-12 11:18:43 +08:00
super_liu 692f9ee9ff Merge branch 'develop_3' into 'develop_master' 
feat: There is no way the

See merge request !108
 2021-08-12 03:09:24 +00:00
super_liu 3f606017e9 feat: There is no way the 2021-08-12 11:08:37 +08:00
super_liu c575c85215 Merge branch 'develop_3' into 'develop_master' 
feat: 新增 convert 转换pdf子项目 MQ

See merge request !107
 2021-08-12 03:07:45 +00:00
super_liu bf800309c4 feat: 新增 convert 转换pdf子项目 MQ 2021-08-12 11:06:42 +08:00
super_liu ae553d92af Merge branch 'develop_3' into 'develop_master' 
feat:There is no way the

See merge request !106
 2021-08-11 09:51:07 +00:00
super_liu 9cdf37713f feat:There is no way the 2021-08-11 17:50:25 +08:00
super_liu dfc86922f2 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !105
 2021-08-11 09:42:05 +00:00
super_liu b7e9cc3061 feat: 新增 convert 转换pdf子项目 2021-08-11 17:40:26 +08:00
super_liu 2f0c627d88 Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-08-11 17:20:48 +08:00
super_liu e93edf3bbb feat: 新增 convert 转换pdf子项目 2021-08-11 17:19:57 +08:00
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