Merge remote-tracking branch 'origin/master'

src/main/java/org/springblade/gateway/mall_gateway/controller/MallYeePayProductController.java

@@ -109,8 +109,8 @@ public class MallYeePayProductController {
 			.eq(ProductFee::getMerchantNo, productFee.getMerchantNo())
 			.eq(ProductFee::getApplicationNo, productFee.getApplicationNo()));
 		if(oldProductFee!=null){
-			log.error("旧数据:{}",oldProductFee);
-			oldProductFee.setRequestNo(productFee.getApplicationStatus());
+			log.error("修改前数据:{}",oldProductFee);
+			oldProductFee.setApplicationStatus(productFee.getApplicationStatus());
 			oldProductFee.setAgreementSignUrl(productFee.getAgreementSignUrl());
 			oldProductFee.setAuditOpinion(productFee.getAuditOpinion());
 			oldProductFee.setProgressDescription(productFee.getProgressDescription());

src/main/java/org/springblade/gateway/shop_gateway/controller/ShopYeePayProduceController.java

@@ -108,8 +108,8 @@ public class ShopYeePayProduceController {
 			.eq(ProductFee::getMerchantNo, productFee.getMerchantNo())
 			.eq(ProductFee::getApplicationNo, productFee.getApplicationNo()));
 		if(oldProductFee!=null){
-			log.error("旧数据:{}",oldProductFee);
-			oldProductFee.setRequestNo(productFee.getApplicationStatus());
+			log.error("修改前数据:{}",oldProductFee);
+			oldProductFee.setApplicationStatus(productFee.getApplicationStatus());
 			oldProductFee.setAgreementSignUrl(productFee.getAgreementSignUrl());
 			oldProductFee.setAuditOpinion(productFee.getAuditOpinion());
 			oldProductFee.setProgressDescription(productFee.getProgressDescription());