FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,089 Commits 1 Branch 0 Tags
8f83b8d5d3abfe5cc1d3fcae6ddbe45a8a55d74c
Commit Graph
3089 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
李雅玮 35cd42ed14 合并分支 'develop_master_new' 到 'develop_master' 
Develop master new

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!1
 2022-12-07 16:36:35 +08:00
CD 372408ac30 企标废止逻辑修正 2022-12-07 13:59:31 +08:00
gaojiabao 728d5c8d25 更名流程-将更名流程走完后，企标计划的名称 2022-12-05 15:34:35 +08:00
gaojiabao aafda76be6 Merge remote-tracking branch 'origin/develop_master_new' into develop_master_new 2022-12-05 15:15:20 +08:00
gaojiabao e715c57b7e 更名流程-将更名流程走完后，企标计划的名称并没有修改 BUG 2022-12-05 15:15:08 +08:00
CD 2f4c74034e Merge remote-tracking branch 'origin/develop_master_new' into develop_master_new 2022-12-05 14:58:25 +08:00
CD b8f9905518 新增角色时添加首页菜单 2022-12-05 14:58:06 +08:00
gaojiabao c0839a370b 更名流程-将更名流程走完后，企标计划的名称并没有修改 BUG 2022-12-05 12:00:28 +08:00
CD 6175ae4785 恢复 2022-12-02 18:13:41 +08:00
CD 2559c51c45 bug62690 2022-12-02 14:04:29 +08:00
CD e7faa9ad2a Merge branch 'develop_master' into FOTON 2022-12-01 20:39:03 +08:00
gaojiabao 6b4812247c Merge remote-tracking branch 'origin/develop_master_new' into develop_master_new 2022-12-01 14:19:33 +08:00
gaojiabao 77d30f9d0b 更名流程-将更名流程走完后，企标计划的名称并没有修改 BUG 2022-12-01 14:19:19 +08:00
cuijiaming 6175ea6b9f 征求意见-查询出来的数据跟数据的查询条件不符合（已解决） 2022-12-01 11:47:37 +08:00
CD 546a839d12 根据树id查找对应层级的节点 2022-11-28 13:36:40 +08:00
CD e06e37f203 Merge remote-tracking branch 'origin/develop_master_new' into develop_master_new 2022-11-25 17:51:07 +08:00
CD 94fef5e08f bug273、bug274 2022-11-25 17:50:42 +08:00
liyawei 1372f306ea 生产环境配置文件恢复 2022-11-24 17:42:22 +08:00
liyawei 044468b7f5 Merge remote-tracking branch 'origin/develop_master' into FOTON 
# Conflicts:
#	adc-da-main/src/main/resources/application-dev.properties
 2022-11-24 17:30:46 +08:00
liyawei 50ded28c72 开发环境配置文件更新 2022-11-24 14:48:32 +08:00
liyawei 19d89cb73f Merge branch 'develop_master' into FOTON 2022-11-22 20:34:25 +08:00
liyawei e68ff9b658 车型项目数据添加日志 2022-11-22 20:03:57 +08:00
liyawei f805415536 174-接受任务回显 2022-11-22 15:07:48 +08:00
liyawei babad96a12 174-管控流程,批准节点获取企标计划ID修改 2022-11-21 19:48:04 +08:00
liyawei 4cd34c749b 174-OA待办修改 2022-11-21 17:39:02 +08:00
liyawei 96ca3ab453 174-删除企标计划和技术标准流程关联表 2022-11-21 14:12:03 +08:00
liyawei 66a7ea2ebd 174-手动新增企标计划 2022-11-21 14:07:20 +08:00
liyawei 960528457a 174-企标计划和技术标准流程关联表 2022-11-18 18:29:21 +08:00
liyawei 143719dccc 249-配置标准bug修改 2022-11-17 13:42:02 +08:00
liyawei d2ce68971f Merge branch 'develop_master' into FOTON 2022-11-15 21:36:24 +08:00
liyawei a41ec08f4f 合规评估-技术评估-查看bug修改 2022-11-15 21:06:43 +08:00
liyawei 402551005f 首页-添加资料中心列表 2022-11-14 13:47:45 +08:00
liyawei 249eef116e Merge branch 'develop_master' into FOTON 2022-11-10 18:24:18 +08:00
liyawei d51705e3bb 180,181-搜索中心bug修改 2022-11-10 17:09:48 +08:00
liyawei 5e9e111f49 Merge branch 'develop_master' into FOTON 2022-11-08 19:30:45 +08:00
liyawei 447fa61549 279-bug修改 2022-11-08 17:53:49 +08:00
liyawei e8d9117d90 279-bug修改 2022-11-08 14:55:29 +08:00
CD 82e9333ef6 222、223 bug 2022-11-08 14:30:48 +08:00
liyawei 20f76b5f83 275-bug修改 2022-11-07 17:47:34 +08:00
liyawei b8bfa39b88 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-11-07 16:40:53 +08:00
liyawei 07c8d1dcea 194-bug修改 2022-11-07 16:40:12 +08:00
CD 58e0240749 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-11-07 15:16:22 +08:00
CD d0542a79b1 标准合规评估流程 起草节点、项目分发节点分别对项目群跟项目增加名称的模糊匹配 2022-11-07 15:16:05 +08:00
liyawei 1403ca6b91 法规清单-归档后合规情况修改 2022-11-07 14:36:57 +08:00
CD 02a3b6cc55 判空bug 2022-11-04 19:07:59 +08:00
CD 3bb6e45f23 bug 2022-11-04 16:27:09 +08:00
liyawei 2fbdb94c34 Merge branch 'develop_master' into FOTON 2022-11-03 18:53:33 +08:00
liyawei 2e2525d68e bug修改 2022-11-03 18:49:01 +08:00
CD 53b2adbf50 log修改 2022-11-02 13:34:21 +08:00
CD d9d21a51c4 校验bug 2022-11-01 10:04:20 +08:00