FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,510 Commits 1 Branch 0 Tags
3213e3797936f2f35ef73a61a6f2f1bb5dfede8b
Commit Graph
2510 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
396572590@qq.com 3213e37979 Merge branch 'develop_master' into FOTON 2022-06-27 17:21:01 +08:00
super_liu fb0c1bbc61 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, #55761 8986的模糊查询，系统查询不到

See merge request LiuChao/foton-slrs-system-rest!540
 2022-06-27 17:19:53 +08:00
396572590@qq.com fa2235a993 feat: There is no way the, #55761 8986的模糊查询，系统查询不到 2022-06-27 16:07:00 +08:00
zhangyanduan 06dcff99af Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master 2022-06-27 14:57:22 +08:00
zhangyanduan 7584a3cc51 fix: 修复当登录的TOKEN认证失败后，抛出的异常中无法被识别到导致前端无法捕获此类异常数据导致无法正确返回页面 2022-06-27 14:57:07 +08:00
yuezhihang cd3729ace3 机构管理 bug + 上传文件改名接口 2022-06-27 14:25:48 +08:00
yuezhihang 19db42504f 预警 2022-06-27 11:32:12 +08:00
yuezhihang 8b2eb6b84a 标准预警推送 新增20s沉睡 避免 频繁死锁 2022-06-27 10:55:52 +08:00
super_liu b867799859 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, BUG #56065

See merge request LiuChao/foton-slrs-system-rest!539
 2022-06-24 18:30:21 +08:00
396572590@qq.com ae0bb036d4 feat: There is no way the, BUG #56065 2022-06-24 18:25:11 +08:00
super_liu 996d2b4cfb Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!538
 2022-06-24 13:50:47 +08:00
396572590@qq.com 8d51647019 feat: There is no way the, bug #55972 复审流程自动发起自动发起草稿 2022-06-24 13:49:53 +08:00
yuezhihang 340615ad26 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-06-24 10:04:30 +08:00
yuezhihang 4177a19406 机构管理 2022-06-24 10:04:18 +08:00
396572590@qq.com 7884aaf319 feat: There is no way the, 自动发起企标复审 自动存入草稿 2022-06-23 18:09:26 +08:00
zhangyanduan 611db02e6e Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master 2022-06-23 15:27:01 +08:00
zhangyanduan e3a5fa808f fix: 修复定时预警代码BUG 2022-06-23 15:26:51 +08:00
yuezhihang 07dcb20360 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-06-23 15:02:53 +08:00
yuezhihang c6a229f0e4 征求意见 查询部门问题 2022-06-23 15:02:47 +08:00
super_liu ad35a94f5f Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, bug #55693

See merge request LiuChao/foton-slrs-system-rest!537
 2022-06-23 15:01:28 +08:00
396572590@qq.com 7429d47622 feat: There is no way the, bug #55693 2022-06-23 14:56:47 +08:00
yuezhihang 6ca4b8420b Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-06-23 14:35:57 +08:00
yuezhihang 03b4ba0d1e 国内 清单bug修复 2022-06-23 14:35:46 +08:00
zhangyanduan 29f6374474 fix: 改造标准预警模块定时执行的逻辑 2022-06-23 14:27:53 +08:00
396572590@qq.com e1a3fd6239 Merge branch 'develop_master' into FOTON 2022-06-23 11:10:11 +08:00
super_liu 8fb63876c9 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, ES 文本索引字段逻辑区分

See merge request LiuChao/foton-slrs-system-rest!536
 2022-06-23 11:08:48 +08:00
396572590@qq.com 1772b09067 feat: There is no way the, ES 文本索引字段逻辑区分 2022-06-23 11:06:40 +08:00
super_liu 6cd06641ca Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!535
 2022-06-22 18:13:53 +08:00
396572590@qq.com 5d8dcb23eb feat: There is no way the, bug #55745 #55786 #55815 2022-06-22 18:11:11 +08:00
yuezhihang 5ea9ca4fea 公开征求意见 + 征求意见流程部门问题 处理 2022-06-22 16:43:29 +08:00
396572590@qq.com d53d7d9d85 feat: There is no way the, bug #55745 #55786 2022-06-22 16:02:55 +08:00
yuezhihang 9d9db343de 问答查询 排序 2022-06-22 14:49:24 +08:00
yuezhihang 7a822f921f 问答查询 标准号字段 查询修复 2022-06-22 09:24:24 +08:00
396572590@qq.com 65a2c44593 Merge branch 'develop_master' into FOTON 2022-06-21 17:13:19 +08:00
yuezhihang f808150027 我的回答 第二列 排序 2022-06-21 16:33:15 +08:00
yuezhihang 427a51daa9 bug 55827 2022-06-21 14:58:03 +08:00
yuezhihang 4ddea28670 问答查询 标准号字段 查询修复 2022-06-21 14:03:27 +08:00
yuezhihang 2a837925ab 数据字典 查询接口 给标准类别强行换顺序 会导致bug产生 2022-06-21 13:56:48 +08:00
396572590@qq.com e2ee532dc1 Merge branch 'develop_master' into FOTON 2022-06-21 11:48:09 +08:00
super_liu 2e239defed Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, bug #55865

See merge request LiuChao/foton-slrs-system-rest!534
 2022-06-20 18:12:05 +08:00
396572590@qq.com 9f84c0facf feat: There is no way the, bug #55865 2022-06-20 18:11:32 +08:00
yuezhihang ad965b5d7d 问答查询 2022-06-20 17:21:42 +08:00
yuezhihang 41d5a6408c Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-06-20 17:11:09 +08:00
super_liu 0d001e1fc0 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, #55663

See merge request LiuChao/foton-slrs-system-rest!533
 2022-06-20 16:36:03 +08:00
396572590@qq.com 478503d94d feat: There is no way the, #55663 2022-06-20 16:31:53 +08:00
yuezhihang c007ba6185 55882 2022-06-20 16:28:00 +08:00
yuezhihang 9d7ac6ecf0 55657 2022-06-20 16:09:13 +08:00
yuezhihang c82ccd27d8 bug 55837 修复 2022-06-20 15:48:28 +08:00
yuezhihang f3eee80a6c 问答查询 标准号字段 查询修复 2022-06-20 15:19:15 +08:00
yuezhihang 7b89fdab71 pom依赖修改 2022-06-20 14:50:10 +08:00