FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,607 Commits 1 Branch 0 Tags
fa06b6f2e45dcee212067ca5d6088d2bf8bc49fd
Commit Graph
2607 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
396572590@qq.com fa06b6f2e4 Merge branch 'develop_master' into FOTON 2022-07-19 08:45:12 +08:00
yuezhihang 76686f95b8 未符合项整改 新增 下拉处理 2022-07-18 17:44:23 +08:00
yuezhihang afeac0ac11 标准评估结果 返回数据补充 2022-07-18 16:59:53 +08:00
yuezhihang ffcc3545f0 56646 56632 2022-07-18 16:39:53 +08:00
yuezhihang d244d7d85f Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-07-18 16:01:36 +08:00
yuezhihang 211f589a55 56637 2022-07-18 16:01:23 +08:00
super_liu 5d0678f71f Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,  56519 企标计划-编辑，引用标准显示null 删除后提交 再次点击还是显示null

See merge request LiuChao/foton-slrs-system-rest!557
 2022-07-18 15:49:18 +08:00
396572590@qq.com 2d3f27bf17 feat: There is no way the, 56519 企标计划-编辑，引用标准显示null 删除后提交 再次点击还是显示null 2022-07-18 15:48:32 +08:00
yuezhihang 3d54698afa Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-07-18 13:59:56 +08:00
yuezhihang e899750c44 资料中心表修改 2022-07-18 13:59:40 +08:00
396572590@qq.com 0282638d90 Merge branch 'develop_master' into FOTON 2022-07-18 11:06:13 +08:00
zyd ebd6b7fd26 add: 国内海外新增译文字段 2022-07-18 00:03:30 +08:00
396572590@qq.com dd0da9abe6 Merge branch 'develop_master' into FOTON 2022-07-16 00:32:03 +08:00
super_liu 7fed13b896 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,  工作流文件下载

See merge request LiuChao/foton-slrs-system-rest!556
 2022-07-16 00:31:24 +08:00
396572590@qq.com 1effa2bbf7 feat: There is no way the, 工作流文件下载 2022-07-16 00:30:56 +08:00
396572590@qq.com 4cc7191312 Merge branch 'develop_master' into FOTON 2022-07-16 00:29:55 +08:00
super_liu 65b62da126 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,  工作流文件下载

See merge request LiuChao/foton-slrs-system-rest!555
 2022-07-16 00:27:52 +08:00
396572590@qq.com fa9284fe8b feat: There is no way the, 工作流文件下载 2022-07-16 00:23:20 +08:00
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