2 Commity cf9fd07fda ... 6996b8687c

Autor SHA1 Wiadomość Data
  yangyj 6996b8687c Merge remote-tracking branch 'origin/master' into master 2 miesięcy temu
  yangyj 90c05a1ad9 2-6 2 miesięcy temu

+ 2 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/ExecutorMeter.java

@@ -1195,11 +1195,11 @@ public class ExecutorMeter extends FormulaExecutor {
                      }
                      payItemZj.add(startPay);
                      payItemZj.add(new InterimPaymentCertificate("扣回动员预付款"));
-                     InterimPaymentCertificate clsbdfk=new InterimPaymentCertificate("材料设备垫付款");
+                     InterimPaymentCertificate clsbdfk=new InterimPaymentCertificate("材料付款");
                      /*材料预付款关联*/
                      clsbdfk.setCurrentPeriodPay(materialSum);
                      payItemZj.add(clsbdfk);
-                     payItemZj.add(new InterimPaymentCertificate("扣回材料设备垫付款"));
+                     payItemZj.add(new InterimPaymentCertificate("扣回材料付款"));
                       blj=new InterimPaymentCertificate("保留金",MINUS_ONE);
                      payItemZj.add(blj);
                      InterimPaymentCertificate thblj=new InterimPaymentCertificate("返回保留金");