Merge remote-tracking branch 'origin/master' into master

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/ContractMaterialAdjustServiceImpl.java

@@ -249,6 +249,7 @@ public class ContractMaterialAdjustServiceImpl extends BaseServiceImpl<ContractM
             String st = "调差公式（标准）:调差金额=0，"+dto.getRangePriceRatio()+"% <= ±"+material.getQuotaRatio()+"%";
             adjust.setAdjustMoney(BigDecimal.ZERO);
             adjust.setAdjustCalculation(st);
+            adjust.setAdjustMoneyPre(BigDecimal.ZERO);
             return ;
         }
         BigDecimal adjustMoney = BigDecimal.ZERO;