Commit Graph
1848 Commits
Author SHA1 Message Date
王夏晖 96c71c50a4 Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!385
2022-01-22 16:46:43 +08:00
zhaokaiyao@91isoft.com 9e7d9f65d4 标准入库流程带入标准的目录体系 2022-01-22 16:38:01 +08:00
zhaokaiyao@91isoft.com 412e9a98be 标准征求意见 文本类型和分解单一致 2022-01-22 15:24:00 +08:00
zhaokaiyao@91isoft.com d0929b3c58 优化方法颗粒度 2022-01-22 14:42:23 +08:00
yuezhihang 5d0df6d02c 机构管理最新需求 2022-01-21 18:54:21 +08:00
zhaokaiyao@91isoft.com e05cd8b787 企标评价流程节点名称变更 2022-01-21 16:27:18 +08:00
yuezhihang 12ad84d7d6 标准合规评估流程 新改动 2022-01-21 15:49:21 +08:00
yuezhihang 278e6d05bb Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-21 14:48:10 +08:00
yuezhihang 5f9f162535 标准合规评估流程的查询接口 2022-01-21 14:48:00 +08:00
王夏晖 1d1beb5b89 Merge branch 'develop_3' into 'develop_master'
查询字典类型 接口回滚

See merge request LiuChao/foton-slrs-system-rest!383
2022-01-21 13:41:17 +08:00
zhaokaiyao@91isoft.com cd8fffa2f8 查询字典类型 接口回滚 2022-01-21 13:36:28 +08:00
2510220824 c97e8442f4 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-21 08:13:03 +08:00
2510220824 c239ad7c99 update:无岗位用户无法访问系统 2022-01-21 08:12:15 +08:00
super_liu 0c387355b4 Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!381
2022-01-20 20:43:52 +08:00
zhaokaiyao@91isoft.com eb15c06699 工作组批量删除 2022-01-20 17:19:52 +08:00
yuezhihang d86f1c12cd 标准合规评估 2022-01-20 16:21:09 +08:00
yuezhihang 888240c86c 流程准备的接口 2022-01-20 15:20:41 +08:00
zhaokaiyao@91isoft.com f3101d6e74 企标详情 文本状态显示textStatusBussShow 2022-01-20 15:07:55 +08:00
yuezhihang 4826332deb 标准合规评估 准备的接口 2022-01-20 15:05:23 +08:00
王夏晖 42b8651544 Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!380
2022-01-19 19:34:32 +08:00
zhaokaiyao@91isoft.com ebe6cd5bf7 编辑判断不能重复时排除自身 规范了返回值 2022-01-19 19:29:40 +08:00
yuezhihang 5f6394975a Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-19 18:23:17 +08:00
yuezhihang a2b38c85d3 调研接口修复 2022-01-19 18:23:10 +08:00
zhaokaiyao@91isoft.com d49893bdf1 为定时任务加上了日志 2022-01-19 17:46:23 +08:00
super_liu d5bf93da2b Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!379
2022-01-19 17:23:55 +08:00
super_liu 3bd285aacd feat: There is no way the, 2022-01-19 17:17:24 +08:00
yuezhihang 4821c6c34b 导出去html标签 2022-01-19 16:47:43 +08:00
yuezhihang 07ce4f1866 流程新需求 2022-01-19 16:27:39 +08:00
王夏晖 a602c5fc3f Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!378
2022-01-19 15:16:16 +08:00
zhaokaiyao@91isoft.com 0612cb210a 定时任务 VALID_FLAG='0' 2022-01-19 15:14:43 +08:00
zhaokaiyao@91isoft.com 0a4fb00ea5 工作组,表字段与实体类 2022-01-19 15:14:07 +08:00
zhaokaiyao@91isoft.com cb2dde3bb2 VALID_FLAG = '0' 2022-01-19 13:43:58 +08:00
王夏晖 5d53017187 Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!377
2022-01-19 13:34:35 +08:00
zhaokaiyao@91isoft.com e6d9f4a652 判断工作组名不能重复 2022-01-19 13:28:24 +08:00
zhaokaiyao@91isoft.com 5ded56b442 Merge remote-tracking branch 'origin/develop_master' into develop_3 2022-01-19 13:15:13 +08:00
zhaokaiyao@91isoft.com 868d11be91 Merge remote-tracking branch 'origin/develop_3' into develop_3 2022-01-19 13:14:51 +08:00
zhaokaiyao@91isoft.com 50d262b610 commit 2022-01-19 13:14:27 +08:00
张君 5291f3cf69 Merge remote-tracking branch 'origin/develop_3' into develop_3 2022-01-19 10:20:08 +08:00
张君 87b843c398 es字段 2022-01-19 10:19:16 +08:00
王夏晖 57bc0f0057 Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!375
2022-01-18 22:56:50 +08:00
zhaokaiyao@91isoft.com fac8ad54bf Merge remote-tracking branch 'origin/develop_master' into develop_3 2022-01-18 22:54:20 +08:00
zhaokaiyao@91isoft.com 06c14bd8cd 工作组接口 2022-01-18 22:53:51 +08:00
zyd d18185e0b7 fix:修复VPPS查询中将其他非本节点下的数据查询出来的BUG 2022-01-18 22:12:14 +08:00
zhaokaiyao@91isoft.com ca79108b71 日志与手动激活定时任务 2022-01-18 21:42:13 +08:00
张君 54ef64c852 注释 2022-01-18 17:09:03 +08:00
super_liu 3a2ef34b80 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, plan lxd

See merge request LiuChao/foton-slrs-system-rest!374
2022-01-18 16:31:53 +08:00
super_liu 2f18292492 feat: There is no way the, plan lxd 2022-01-18 16:28:20 +08:00
zhaokaiyao@91isoft.com 4da914c88a 新增自定义工作组模块 2022-01-18 15:39:54 +08:00
super_liu fe9d3c6ec6 Merge branch 'develop_3' into 'develop_master'
Develop 3

See merge request LiuChao/foton-slrs-system-rest!373
2022-01-18 03:42:27 +08:00
zhaokaiyao@91isoft.com dccdd471f0 当在编辑标准的国家地区的时候,自动添加到国家地区清单中,并且把标准的是否纳入认证清单改为"是" 2022-01-17 17:31:28 +08:00