Merge branch 'master' into 'uat'

# Conflicts:
#   src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java
#   src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java

deployment-sim.yaml

@@ -7,7 +7,7 @@ metadata:
     app: biz-service-ebtp-project  
     
 spec:                      
-  replicas: 3              
+  replicas: 1
   strategy:
     rollingUpdate:  
       maxSurge: 1       

src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java

@@ -103,6 +103,7 @@ public interface IProjectEntrustService extends IBaseService<ProjectEntrust>{
      */
     boolean deleteProjectEntrust(Long ebpProjectId,String reason);
 
+
     /**
      * 根据委托单ids，批量查询委托单数据
      * @param ids 委托单ids

src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java

@@ -559,6 +559,7 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
         return returnList;
     }
 
+
     /**
      * 出始化项目辅助相关信息
      * @param projectEntrustVO 插入信息