Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -812,14 +812,14 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         //车架号发生变化，重新生成新车买卖合同（欠款）、欠款提车担保承诺书、总经理担保承诺书、
         //回购日期发生变化，重新生成欠款提车担保承诺书
         if (StringUtils.isBlank(sid)) {
-           /* //生成新车买卖合同（欠款）
+            //生成新车买卖合同（欠款）
             carContractDownloadUrl = carContractDownloadUrl(dto, map);
             //生成欠款提车担保承诺书
             guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
             //生成总经理担保书
             zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
             //生成股东会对外担保决议
-            gdLetterDownloadUrl = gdLetterDownloadUrl(dto, map);*/
+            gdLetterDownloadUrl = gdLetterDownloadUrl(dto, map);
             PdfVo pdfVo = new PdfVo();
             List<File> filesList = new ArrayList<>();
             if (StringUtils.isNotBlank(carContractDownloadUrl)) {
@@ -907,13 +907,13 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             }
             if (isChange) {
                 //生成新车买卖合同（欠款）
-//                carContractDownloadUrl = carContractDownloadUrl(dto, map);
+                carContractDownloadUrl = carContractDownloadUrl(dto, map);
                 //生成总经理担保书
-//                zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
+                zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
             }
             if (dateChange || isChange) {
                 //生成欠款提车担保承诺书
-//                guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
+                guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
             }
             //新车买卖合同（欠款）
             PdfVo pdfVo = new PdfVo();