Merge branches 'feature/20211112_1元捐插件_wuping' and 'qa' of…

Merge branches 'feature/20211112_1元捐插件_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

order-application-service/src/main/java/cn/freemud/entities/dto/pay/PayOrderDto.java

@@ -15,8 +15,6 @@ public class PayOrderDto {
 
     private String nonceStr;
 
-    private String sign;
-
     private String timestamp;
 
     private String signType;

order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java

@@ -1262,7 +1262,7 @@ public class PayServiceImpl {
             payBean.setAppid(payOrderBean.getAppid());
             payBean.setNonceStr(payOrderBean.getNonceStr());
             payBean.setPackageX(payOrderBean.getPackageX());
-            payBean.setSign(payOrderBean.getSign());
+            payBean.setSign(payOrderBean.getPaySign());
             payBean.setSignType(payOrderBean.getSignType());
             payBean.setTimestamp(payOrderBean.getTimestamp());
             payBean.setAliPayOrder(payOrderBean.getAliPayOrder());