Commit Graph
2589 Commits
Author SHA1 Message Date
396572590@qq.com ec146c4275 Merge branch 'develop_master' into FOTON 2022-07-15 22:53:09 +08:00
super_liu 1e9779262f Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  工作流文件下载

See merge request LiuChao/foton-slrs-system-rest!554
2022-07-15 22:26:17 +08:00
396572590@qq.com 1c7ead8867 feat: There is no way the, 工作流文件下载 2022-07-15 22:23:09 +08:00
super_liu 9c6a577320 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, #56403 企标计划-查看 制修订类型显示错误

See merge request LiuChao/foton-slrs-system-rest!553
2022-07-15 18:05:06 +08:00
396572590@qq.com 1f29f48bc7 feat: There is no way the, #56403 企标计划-查看 制修订类型显示错误 2022-07-15 17:09:23 +08:00
yuezhihang 0f12f732ef 问答库 左侧树 加排序字段 2022-07-15 15:56:35 +08:00
yuezhihang b44c37f308 国内标准 起草部门 对应 2022-07-15 15:32:32 +08:00
yuezhihang 466fce434c Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-07-15 14:42:25 +08:00
yuezhihang ea247ac159 bug修复 2022-07-15 14:42:19 +08:00
zyd 3054a37b71 fix: 去掉查询权限菜单树种每个数据更新的逻辑,修改成只有层级结构有变化的时候才更新 2022-07-15 13:28:14 +08:00
zyd b1f0e0c54d 去掉加载角色菜单权限时,递归执行更新SQL的BUG 2022-07-15 11:42:10 +08:00
yuezhihang 26adc2ca8d 绑定角色逻辑 2022-07-15 11:35:03 +08:00
396572590@qq.com d36ea87c1c Merge branch 'develop_master' into FOTON 2022-07-14 08:51:18 +08:00
zyd e2ce4daf7d fix: 修复线上报错的BUG 2022-07-13 22:51:31 +08:00
396572590@qq.com 1924844c38 Merge branch 'develop_master' into FOTON 2022-07-13 17:16:52 +08:00
yuezhihang fb8d1d62ec Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-07-13 17:11:28 +08:00
yuezhihang 9b3ea05963 资料中心 2022-07-13 17:11:21 +08:00
zhangyanduan f3544694e2 Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master 2022-07-13 14:44:53 +08:00
zhangyanduan e42fbce67e fix: 修复线上BUG 2022-07-13 14:44:43 +08:00
yuezhihang ffa12e7357 sql 2022-07-13 14:13:30 +08:00
yuezhihang 560625f6e1 问答查询 查询修复 2022-07-13 11:25:31 +08:00
yuezhihang 0144c6a28e Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-07-13 11:24:33 +08:00
yuezhihang 91c24401f2 问答查询 查询条件 2022-07-13 11:24:24 +08:00
396572590@qq.com df3848e2a4 Merge branch 'develop_master' into FOTON 2022-07-12 17:02:59 +08:00
super_liu 8617abdcd6 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  ^

See merge request LiuChao/foton-slrs-system-rest!552
2022-07-12 16:57:59 +08:00
396572590@qq.com 86f5e09232 feat: There is no way the, ^ 2022-07-12 16:53:51 +08:00
396572590@qq.com 053b615552 Merge branch 'develop_master' into FOTON 2022-07-12 11:55:53 +08:00
yuezhihang d8601d85cb 资料中心排序 2022-07-12 10:48:50 +08:00
yuezhihang f2ab31c4c4 资料中心查询条件 2022-07-11 14:53:48 +08:00
yuezhihang 1d8d48976a 问答查询 标准号字段 查询修复 2022-07-08 17:55:35 +08:00
yuezhihang 99238f4401 问答库 2022-07-08 17:11:34 +08:00
yuezhihang 9bbc7827ec 标准号字段 查询修复 2022-07-07 17:23:32 +08:00
yuezhihang fc561348e5 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-07-07 17:03:02 +08:00
yuezhihang 98d267230e 标准类别sql+资料中心部分代码 2022-07-07 17:02:55 +08:00
zhangyanduan 788483b2ba fix: AWC查询接口中优化返回的文件类型内容 2022-07-06 18:04:53 +08:00
yuezhihang ea0480a404 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-07-06 17:53:14 +08:00
yuezhihang 9cd2536e71 资料中心 接口 以及sql 2022-07-06 17:53:01 +08:00
super_liu 3dd1dec40a Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  #56326 #56321

See merge request LiuChao/foton-slrs-system-rest!551
2022-07-06 16:21:01 +08:00
396572590@qq.com ec259147db feat: There is no way the, #56326 #56321 2022-07-06 16:20:20 +08:00
super_liu 3b48e7cff8 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!550
2022-07-06 16:09:43 +08:00
396572590@qq.com 2ff17e8b27 feat: There is no way the, 自动更新废止 2022-07-06 15:59:50 +08:00
zhangyanduan 2b9a977204 fix:优化文档转换组件的消息队列 2022-07-06 09:23:47 +08:00
396572590@qq.com e14f4530f5 feat: There is no way the, #56326 #56321 2022-07-05 18:03:14 +08:00
yuezhihang 667b3efff4 消息队列 2022-07-05 11:19:49 +08:00
yuezhihang 07303047fa 工作组 2022-07-05 09:21:45 +08:00
yuezhihang 348b4b0be5 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-07-04 13:29:44 +08:00
yuezhihang f8761dda1b 其他清单-编辑 程序异常(走过更新发布流程 2022-07-04 13:29:35 +08:00
super_liu 98d049af2f Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, #55969 #55973 企标顺序号相关逻辑

See merge request LiuChao/foton-slrs-system-rest!549
2022-07-03 18:04:18 +08:00
396572590@qq.com 8b70a4c80d feat: There is no way the, #55969 #55973 企标顺序号相关逻辑 2022-07-03 18:02:57 +08:00
super_liu 58fa98fe3a Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  企标顺序号关联逻辑

See merge request LiuChao/foton-slrs-system-rest!548
2022-07-02 22:41:27 +08:00