Merge branch 'develop' into develop2

src/custom/restcontroller/sale/cashbill/IncomeExportExcel.java

@@ -209,7 +209,7 @@ public class IncomeExportExcel {
 
         cell = row.createCell(0);
         cell.setCellStyle(cellStyle3);
-        cell.setCellValue("1111");
+        cell.setCellValue("0000");
 
         cell = row.createCell(1);
         cell.setCellStyle(cellStyle3);

src/custom/restcontroller/sale/cashbill/PayExportExcel.java

@@ -209,7 +209,7 @@ public class PayExportExcel {
 
         cell = row.createCell(0);
         cell.setCellStyle(cellStyle3);
-        cell.setCellValue("1111");
+        cell.setCellValue("0000");
 
         cell = row.createCell(1);
         cell.setCellStyle(cellStyle3);