Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/ims into develop

pom.xml

@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.mmc.csf</groupId>
-    <artifactId>iuav-ims</artifactId>aa
+    <artifactId>iuav-ims</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>信息发布管理系统</name>

release-service/src/main/java/com/mmc/csf/release/service/impl/FlyerTrainingServiceImpl.java

@@ -52,7 +52,6 @@ import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
-import static com.sun.activation.registries.LogSupport.log;
 
 /**
  * @Author LW
@@ -303,7 +302,7 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
 
         if(userSalaryAmt.add(userCashAmt).compareTo(tempTotalAmount) < 0 ){
             if(!(weChatPay.compareTo(BigDecimal.ZERO) == 0)){
-                log("云享金或者佣金不够支付,支付失败,请回滚微信支付中的金额:" + curriculumPayVO.getPaymentOrderNumber());
+//                log("云享金或者佣金不够支付,支付失败,请回滚微信支付中的金额:" + curriculumPayVO.getPaymentOrderNumber());
                 return ResultBody.error("云享金或者佣金不够支付,支付失败,请回滚微信支付中的金额");
             }else{
                 return  ResultBody.error("云享金或者佣金不够支付,支付失败");