Commit Graph
1412 Commits
Author SHA1 Message Date
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
zyd e2ce4daf7d fix: 修复线上报错的BUG 2022-07-13 22:51:31 +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 560625f6e1 问答查询 查询修复 2022-07-13 11:25:31 +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
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 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 9cd2536e71 资料中心 接口 以及sql 2022-07-06 17:53:01 +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
396572590@qq.com 8b70a4c80d feat: There is no way the, #55969 #55973 企标顺序号相关逻辑 2022-07-03 18:02:57 +08:00
396572590@qq.com 4131965f6e feat: There is no way the, 企标顺序号关联逻辑 2022-07-02 22:34:04 +08:00
396572590@qq.com 83b806c932 feat: There is no way the, bug #56143 企标相关-- 选择人员后带入的起草责任单位支持三级查询 2022-07-01 14:38:34 +08:00
396572590@qq.com 19b4863d18 Merge branch 'develop_master' into develop_migration 2022-06-30 09:31:51 +08:00
396572590@qq.com 20d23a427e feat: There is no way the, 改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多 改为测 2022-06-29 15:31:50 +08:00
yuezhihang a8e7a28de5 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-06-29 08:53:42 +08:00
super_liu 4380b2af06 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多…… 待改完

See merge request LiuChao/foton-slrs-system-rest!543
2022-06-28 18:04:39 +08:00
396572590@qq.com aa3bdac315 feat: There is no way the, 改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多…… 待改完 2022-06-28 17:55:40 +08:00
yuezhihang 6199f40128 sonar 2022-06-28 17:04:07 +08:00
super_liu d9b478ea63 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 企标编辑优化

See merge request LiuChao/foton-slrs-system-rest!541
2022-06-28 11:48:12 +08:00
396572590@qq.com 0ea7f77dba feat: There is no way the, 企标编辑优化 2022-06-28 11:47:03 +08:00
yuezhihang b5555110e0 标注评估结果分页查询加上 来自分解单的字段 2022-06-27 17:24:34 +08:00
yuezhihang cd3729ace3 机构管理 bug + 上传文件改名接口 2022-06-27 14:25:48 +08:00
yuezhihang 19db42504f 预警 2022-06-27 11:32:12 +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
396572590@qq.com 7884aaf319 feat: There is no way the, 自动发起企标复审 自动存入草稿 2022-06-23 18:09:26 +08:00
yuezhihang 03b4ba0d1e 国内 清单bug修复 2022-06-23 14:35:46 +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 427a51daa9 bug 55827 2022-06-21 14:58:03 +08:00
yuezhihang 2a837925ab 数据字典 查询接口 给标准类别强行换顺序 会导致bug产生 2022-06-21 13:56:48 +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