FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,768 Commits 1 Branch 0 Tags
e70b85bbd76e881b6983dbdb902a2f7c5541d098
Commit Graph
1768 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yuezhihang e70b85bbd7 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-12 10:20:42 +08:00
yuezhihang fed0b3dc85 公开征求意见 导出 bug修复 2022-01-12 10:20:28 +08:00
super_liu e2bbc146ae Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!368
 2022-01-11 22:55:54 +08:00
zhaokaiyao@91isoft.com d01ea4592d 暂停预警定时任务 2022-01-11 22:52:58 +08:00
zhaokaiyao@91isoft.com d4ef4e3477 预警 在产车实施日期查询 使用了两个startZCCSSRQ 2022-01-11 22:33:28 +08:00
zhaokaiyao@91isoft.com 8a9971c046 预警 发布日期查询与回显 2022-01-11 22:27:36 +08:00
yuezhihang 654e7e8127 征求意见流程自动发起日期加一天问题修复 2022-01-11 15:35:59 +08:00
zhaokaiyao@91isoft.com e1206d7f80 Merge remote-tracking branch 'origin/develop_master' into develop_3 2022-01-11 14:23:55 +08:00
zhaokaiyao@91isoft.com 84ca9f9524 Merge remote-tracking branch 'origin/FOTON' into develop_3 2022-01-11 14:21:01 +08:00
yuezhihang b26de7b09b 会议信息修改bug修复 2022-01-11 14:12:30 +08:00
yuezhihang dc57f4c58f Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-11 14:05:08 +08:00
yuezhihang b4d36e8888 会议信息修改bug修复 2022-01-11 14:05:00 +08:00
zhaokaiyao@91isoft.com 7a4e96c004 Merge remote-tracking branch 'origin/develop_master' into develop_3 2022-01-11 13:57:35 +08:00
zhaokaiyao@91isoft.com 70ee309ac2 Merge remote-tracking branch 'origin/develop_master' into develop_3 2022-01-11 13:56:45 +08:00
王夏晖 5b6bb36588 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!367
 2022-01-11 13:40:07 +08:00
王夏晖 925ab6219e Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!366
 2022-01-11 13:39:28 +08:00
yuezhihang 914d2c3d06 测试会后流程 一小时发起一次 2022-01-11 11:08:14 +08:00
zhaokaiyao@91isoft.com c4a40c59cb 清单中的企标查询 2022-01-11 10:51:35 +08:00
yuezhihang bf0d4c2106 公开征求意见导出修改 2022-01-11 10:14:35 +08:00
super_liu 67395f75c7 Merge branch 'develop_master' into FOTON 2022-01-10 23:31:57 +08:00
zhaokaiyao@91isoft.com 1b2c595f50 预警导出 2022-01-10 20:48:41 +08:00
yuezhihang dc5f63fdb5 公开征求意见导出 修复 2022-01-10 18:25:55 +08:00
yuezhihang 596528bcbf 公开征求意见模块导出上报意见功能 修复 2022-01-10 18:10:09 +08:00
zhaokaiyao@91isoft.com 7594824a76 企标日期查询 2022-01-10 17:54:37 +08:00
yuezhihang fbde67fd7f 征求意见流程内部导出 bug修复 2022-01-10 17:27:09 +08:00
zhaokaiyao@91isoft.com 557a9f756c 预警存入日期表的数据应该在预警期限内,查询预警数据时已逻辑删除的数据不显示 2022-01-10 12:49:56 +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
zhaokaiyao@91isoft.com 9791fd13e9 企标高级查询 2022-01-07 17:10:21 +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
zhaokaiyao@91isoft.com 73a847b02c 查询 用户 质量评分 创建时间最新的数据 2022-01-07 15:13:56 +08:00
yuezhihang 935cdf07ee 标准比对审核中状态出现 bug修复 --》已不出现 2022-01-07 14:58:14 +08:00
zhaokaiyao@91isoft.com c8676cdf4a commit comment 2022-01-07 14:19:47 +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