 高嵩
|
fa59fd0aa8
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!29
|
2023-04-04 09:35:54 +08:00 |
|
|
高嵩
|
9eb62c3c65
|
Merge branch 'master' into 'dev_20230216'
# Conflicts:
# adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
|
2023-04-04 09:35:34 +08:00 |
|
|
高嵩
|
2ca755d253
|
合并分支 'dev_20230216' 到 'master'
优化企标导入
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!28
|
2023-03-28 18:23:07 +08:00 |
|
|
高嵩
|
3d05df1055
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!27
|
2023-03-27 18:14:08 +08:00 |
|
|
高嵩
|
98cc554faa
|
Merge remote-tracking branch 'origin/dev_20230216'
# Conflicts:
# adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
# adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
# adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
|
2023-03-26 16:53:41 +08:00 |
|
|
高嵩
|
6a683aed12
|
合并分支 'dev_chaifen_20230322' 到 'master'
Dev chaifen 20230322
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!25
|
2023-03-26 16:42:19 +08:00 |
|
|
高嵩
|
ff6fa180ea
|
合并分支 'fix_foton_20230308' 到 'master'
企标技术标准历史版本文件问题
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!24
|
2023-03-09 17:11:46 +08:00 |
|
|
高嵩
|
d5e45e8ef4
|
修改elasticsearch.img配置
|
2023-02-15 10:45:14 +08:00 |
|
|
高嵩
|
9186b38f82
|
合并分支 'fix_foton' 到 'master'
Fix foton
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!21
|
2023-02-15 10:31:39 +08:00 |
|
|
高嵩
|
862960b3bf
|
Merge remote-tracking branch 'origin/dev_foton_GJB'
# Conflicts:
# adc-da-main/src/main/resources/application.properties
|
2023-02-13 09:25:44 +08:00 |
|
|
高嵩
|
b585602df7
|
合并分支 'FOTON' 到 'master'
Foton
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!17
|
2023-02-03 11:09:25 +08:00 |
|
|
高嵩
|
836b4b0f95
|
合并分支 'dev_foton_CD' 到 'fix_foton'
Dev foton cd
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!16
|
2023-01-12 15:16:16 +08:00 |
|
|
高嵩
|
2c86fa4831
|
合并分支 'dev_foton_DBQ' 到 'fix_foton'
Dev foton dbq
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!15
|
2023-01-12 15:15:17 +08:00 |
|
|
高嵩
|
139e7f3e49
|
合并分支 'develop_master_new' 到 'fix_foton'
Develop master new
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!14
|
2023-01-12 15:14:16 +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 |
|
|
高嵩
|
bba67a11dc
|
回复线上pom.xml的net.sf.dozer配置
|
2022-12-07 17:05:42 +08:00 |
|