FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,743 Commits 1 Branch 0 Tags
67395f75c7afb61e4e664d565673d812f42e6493
Commit Graph
1743 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
super_liu 67395f75c7 Merge branch 'develop_master' into FOTON 2022-01-10 23:31:57 +08:00
yuezhihang dc5f63fdb5 公开征求意见导出 修复 2022-01-10 18:25:55 +08:00
yuezhihang 596528bcbf 公开征求意见模块导出上报意见功能 修复 2022-01-10 18:10:09 +08:00
yuezhihang fbde67fd7f 征求意见流程内部导出 bug修复 2022-01-10 17:27:09 +08:00
super_liu 1a520f0d76 Merge branch 'develop_master' into FOTON 2022-01-08 17:34:18 +08:00
yuezhihang 5f67b22e7c 条款比对出现比对完成状态 2022-01-07 17:16:32 +08:00
王夏晖 46ba3ef7d3 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!365
 2022-01-07 17:02:27 +08:00
yuezhihang 0de45b8b35 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-07 16:22:05 +08:00
yuezhihang 6a4b807ecb 日期注解不生效问题 角色列表 差八小时 修复 2022-01-07 16:21:58 +08:00
王夏晖 a662082db3 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!364
 2022-01-07 15:53:08 +08:00
王夏晖 b6f30bb322 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!362
 2022-01-07 15:52:39 +08:00
yuezhihang 935cdf07ee 标准比对审核中状态出现 bug修复 --》已不出现 2022-01-07 14:58:14 +08:00
yuezhihang ab75e52455 未符合项整改 导出bug修复 2022-01-07 14:16:41 +08:00
zhaokaiyao@91isoft.com be24afce0e 国内外自定义查询接口 添加对范围日期和多选的查询支持 2022-01-07 14:16:35 +08:00
zhaokaiyao@91isoft.com b15cd814ca 企标流程质量评分 计算总分修改 2022-01-07 14:15:41 +08:00
王夏晖 40fb539d7e Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!361
 2022-01-07 10:57:14 +08:00
yuezhihang 12a9e4db39 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-07 10:52:22 +08:00
yuezhihang bc57848bdf 未符合项整改去除 产品类型字段 影响点--》导出 2022-01-07 10:52:16 +08:00
王夏晖 32e78adaab Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!360
 2022-01-07 10:33:54 +08:00
王夏晖 3f6cb25ed7 Merge branch 'develop_3' into 'develop_master' 
企标详情  属性字典查询为空时,使用其本身数值

See merge request LiuChao/foton-slrs-system-rest!359
 2022-01-07 10:33:37 +08:00
super_liu 12373a02eb Merge branch 'develop_master' into FOTON 2022-01-06 20:34:05 +08:00
super_liu 8b7ea559f8 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!358
 2022-01-06 18:03:26 +08:00
super_liu fe2949edd5 feat: There is no way the, 2022-01-06 18:02:47 +08:00
zhaokaiyao@91isoft.com 2e6ca96447 企标详情 属性字典查询为空时,使用其本身数值 2022-01-06 17:53:31 +08:00
王夏晖 853821bd45 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!357
 2022-01-06 17:40:06 +08:00
yuezhihang 1012aec3d3 公开征求意见--查询修复 2022-01-06 17:37:47 +08:00
yuezhihang f15935bbef 征求意见 时间范围查询 2022-01-06 16:31:15 +08:00
王夏晖 d678c4bcc8 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!355
 2022-01-06 15:35:12 +08:00
yuezhihang 5a78c69bcc 清单项目 精确查询===》修复 2022-01-06 15:00:42 +08:00
yuezhihang 7f2d7b6454 查询不存在清单 导致清单报错问题修复 2022-01-06 14:14:50 +08:00
yuezhihang 043c3e8929 征求意见导出 bug 以及 批量修改权限 修复 2022-01-06 13:56:06 +08:00
王夏晖 56b4f4e5c9 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!354
 2022-01-06 01:06:49 +08:00
王夏晖 ed695393f3 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!353
 2022-01-06 01:06:33 +08:00
super_liu b9410fbd69 Merge branch 'develop_master' into FOTON 2022-01-05 21:39:20 +08:00
super_liu 2faa8a452e Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!352
 2022-01-05 21:37:30 +08:00
super_liu 5fdb04f96f feat: There is no way the, 2022-01-05 21:21:48 +08:00
super_liu 496499c08f Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!351
 2022-01-05 17:55:18 +08:00
super_liu a956ea2526 feat: There is no way the, 2022-01-05 17:53:15 +08:00
yuezhihang 055b3a7fc5 公开征求意见 导出bug修复 2022-01-05 16:18:42 +08:00
yuezhihang d7c9a117b5 征求意见查询bug修复 2022-01-05 15:44:52 +08:00
zhaokaiyao@91isoft.com 8eeb61a354 预警日期3年36个月 2022-01-05 14:26:28 +08:00
zhaokaiyao@91isoft.com 475a245e39 改了日志输出 2022-01-05 10:14:14 +08:00
zhaokaiyao@91isoft.com 509e68b6d5 预警日期排序 2022-01-05 10:13:32 +08:00
王夏晖 a02d0657a0 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!350
 2022-01-05 08:57:10 +08:00
王夏晖 62072ceeca Merge branch 'develop_3' into 'develop_master' 
预警期限为12个月

See merge request LiuChao/foton-slrs-system-rest!349
 2022-01-05 08:56:17 +08:00
zhaokaiyao@91isoft.com d458dffdb8 预警日志 2022-01-05 00:04:11 +08:00
zhaokaiyao@91isoft.com d6e5fe038d 预警期限为12个月 2022-01-04 21:44:03 +08:00
王夏晖 4b2b0bc865 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!348
 2022-01-04 16:45:56 +08:00
yuezhihang 0a287e59c7 工作组bug修复 2022-01-04 15:44:18 +08:00
yuezhihang e17f8710b1 工作组颜色bug修复 2022-01-04 14:14:08 +08:00