 陈栋
|
8a15758cb5
|
合并分支 'develop_master_new' 到 'FOTON'
注掉的消息队列放开
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!7
|
2022-12-22 13:35:17 +08:00 |
|
|
CD
|
09864c36f9
|
注掉的消息队列放开
|
2022-12-22 13:32:42 +08:00 |
|
|
陈栋
|
3da10abfed
|
合并分支 'develop_master_new' 到 'FOTON'
map空指针报错
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!6
|
2022-12-21 15:05:14 +08:00 |
|
|
CD
|
9e55631f4c
|
map空指针报错
|
2022-12-21 15:02:46 +08:00 |
|
|
陈栋
|
3332d1e8be
|
合并分支 'fix_foton' 到 'FOTON'
Fix foton
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!5
|
2022-12-14 16:36:01 +08:00 |
|
|
陈栋
|
d5250c0fa6
|
合并分支 'dev_foton_CD' 到 'fix_foton'
Dev foton cd
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!4
|
2022-12-14 16:34:05 +08:00 |
|
|
CD
|
8931636619
|
bug63687
|
2022-12-14 14:17:07 +08:00 |
|
|
CD
|
d7554bf514
|
定时器恢复
|
2022-12-14 13:42:32 +08:00 |
|
|
高嵩
|
b1d5700c48
|
Merge remote-tracking branch 'origin/develop_master_new' into FOTON
|
2022-12-08 17:12:35 +08:00 |
|
|
高嵩
|
4a4c91cad8
|
Merge remote-tracking branch 'origin/fix_foton' into FOTON
|
2022-12-08 17:12:19 +08:00 |
|
|
高嵩
|
8cd4537286
|
合并分支 'dev_foton_CJM' 到 'fix_foton'
征求意见-（代码修改）
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!3
|
2022-12-08 17:09:28 +08:00 |
|
|
liyawei
|
95884095fb
|
临时手动更新ALL标准数据索引
|
2022-12-08 14:41:18 +08:00 |
|
|
cuijiaming
|
89106c2bab
|
征求意见-（代码修改）
|
2022-12-07 17:30:39 +08:00 |
|
|
高嵩
|
bba67a11dc
|
回复线上pom.xml的net.sf.dozer配置
|
2022-12-07 17:05:42 +08:00 |
|
|
liyawei
|
a90d57b4c5
|
生产环境配置文件恢复
|
2022-12-07 16:46:13 +08:00 |
|
|
李雅玮
|
f5cb0eff52
|
合并分支 'develop_master' 到 'FOTON'
Develop master
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!2
|
2022-12-07 16:38:12 +08:00 |
|
|
李雅玮
|
23d50e06d1
|
Merge branch 'FOTON' into 'develop_master'
# Conflicts:
# adc-da-main/src/main/resources/application.properties
|
2022-12-07 16:38:07 +08:00 |
|
|
李雅玮
|
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 |
|