FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,886 Commits 1 Branch 0 Tags
4f6926ddf79a874ffdab8d4bf44dc6d14d0cc620
Commit Graph
1886 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yuezhihang 4f6926ddf7 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-27 09:36:03 +08:00
王夏晖 607a131fb5 Merge branch 'develop_3' into 'develop_master' 
标准新增以及编辑时 代替标准号在我的收藏中时,此标准也将插入我的收藏

See merge request LiuChao/foton-slrs-system-rest!394
 2022-01-27 09:34:52 +08:00
yuezhihang e9ddea77da Merge remote-tracking branch 'origin/develop_3' into develop_master 2022-01-27 09:34:43 +08:00
2510220824 a89e642f00 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-26 23:05:06 +08:00
zhaokaiyao@91isoft.com 4379ede739 标准新增以及编辑时 代替标准号在我的收藏中时,此标准也将插入我的收藏 2022-01-26 23:02:32 +08:00
yuezhihang bd2b70930f Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-26 20:38:02 +08:00
yuezhihang b1ecd09547 分解单查询接口 标准评估流程用 2022-01-26 20:37:55 +08:00
2510220824 cde2bb97e8 update:修正合并条款造成解读时条款不显示的问题 2022-01-26 19:19:36 +08:00
王夏晖 3ed58ba0db Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!393
 2022-01-26 14:55:24 +08:00
zhaokaiyao@91isoft.com 59e44f1e7e 查询体系目录接口 新增 入库时不显示"我的收藏" 2022-01-25 22:45:37 +08:00
super_liu dc559482ac Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, buss state scheduled

See merge request LiuChao/foton-slrs-system-rest!392
 2022-01-25 20:11:08 +08:00
super_liu ccaf7d5b86 feat: There is no way the, buss state scheduled 2022-01-25 18:42:46 +08:00
zhaokaiyao@91isoft.com 0cb9d6c3f7 label写成了 lable 2022-01-25 15:42:57 +08:00
zhaokaiyao@91isoft.com 7d0aa45cb1 接口拦截 2022-01-25 14:13:35 +08:00
yuezhihang 3c295a6e3e Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-24 22:22:39 +08:00
yuezhihang d2dfa6b2b0 标准合规评估查询条件 以及征求意见流程内导出 新增字段 2022-01-24 22:22:33 +08:00
super_liu b992c47c94 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, buss state

See merge request LiuChao/foton-slrs-system-rest!391
 2022-01-24 20:08:42 +08:00
super_liu 01a0a31d15 feat: There is no way the, buss state 2022-01-24 20:00:01 +08:00
zhaokaiyao@91isoft.com a7c33531a7 Merge remote-tracking branch 'origin/FOTON' into develop_3 2022-01-24 19:26:52 +08:00
王夏晖 46fd4ef86c Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!390
 2022-01-24 18:27:56 +08:00
zhaokaiyao@91isoft.com f721b08970 国内外标准入库 关联体系目录新增与带入 2022-01-24 18:25:58 +08:00
zhaokaiyao@91isoft.com 8cb6b11d9f Merge remote-tracking branch 'origin/develop_master' into develop_3 2022-01-24 16:57:29 +08:00
zhaokaiyao@91isoft.com 64d9035cad Merge remote-tracking branch 'origin/develop_master' into develop_3 2022-01-24 16:56:20 +08:00
王夏晖 e24dd1ad6b Merge branch 'develop_3' into 'develop_master' 
企标库 ,代替标准号

See merge request LiuChao/foton-slrs-system-rest!389
 2022-01-24 16:10:49 +08:00
zhaokaiyao@91isoft.com 3ebb6c9dc2 企标库 ,代替标准号 2022-01-24 16:07:29 +08:00
王夏晖 6d313ca819 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!388
 2022-01-24 15:25:19 +08:00
zhaokaiyao@91isoft.com 8f650eeb81 标准入库流程带入标准的目录体系: 多余字段和break条件 2022-01-24 15:11:59 +08:00
zyd cbd9ca5959 fix: 模块单元数据 重新处理以及支持卡车和乘用车两种类型 2022-01-23 22:48:24 +08:00
zhaokaiyao@91isoft.com 2bc533d3ec Merge remote-tracking branch 'origin/develop_master' into develop_3 2022-01-22 19:24:03 +08:00
王夏晖 91e4a2c7b3 Merge branch 'develop_3' into 'develop_master' 
标准入库流程带入标准的目录体系:返回体系目录名称

See merge request LiuChao/foton-slrs-system-rest!386
 2022-01-22 19:15:19 +08:00
zhaokaiyao@91isoft.com 8c5008e869 标准入库流程带入标准的目录体系:返回体系目录名称 2022-01-22 19:13:40 +08:00
王夏晖 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
super_liu 4bd68bb39d Merge branch 'develop_master' into FOTON 2022-01-22 08:26:29 +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
王夏晖 5f18bf5235 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!384
 2022-01-21 13:48:42 +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
王夏晖 896fcf4952 Merge branch 'develop_master' into 'FOTON' 
Develop master

See merge request LiuChao/foton-slrs-system-rest!382
 2022-01-21 08:14:40 +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 1cab47439c Merge branch 'develop_master' into FOTON 2022-01-20 20:44:29 +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