Merge branch 'develop' into develop2

src/custom/restcontroller/webmanage/sale/itempriceadjust/ExportExcel.java

@@ -166,7 +166,7 @@ public class ExportExcel {
         cellStyle2.setWrapText(true);
 
         /*第一行*/
-        sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 6));
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 7));
 
         /*第一行塞值*/
         row = sheet.createRow(0);
@@ -174,7 +174,7 @@ public class ExportExcel {
         cell.setCellStyle(cellStyle4);
         cell.setCellValue("商品调价单导入");
         /*第二行*/
-        sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 6));
+        sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 7));
         /*第二行塞值*/
         row = sheet.createRow(1);
         cell = row.createCell(0);// ID
@@ -281,7 +281,7 @@ public class ExportExcel {
 
 
         /*第一行*/
-        sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 7));
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 8));
 
         /*第一行塞值*/
         row = sheet.createRow(0);
@@ -289,7 +289,7 @@ public class ExportExcel {
         cell.setCellStyle(cellStyle3);
         cell.setCellValue("商品调价单导入");
         /*第二行*/
-        sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 7));
+        sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 8));
         /*第二行塞值*/
         row = sheet.createRow(1);
         cell = row.createCell(0);// ID

src/custom/restcontroller/webmanage/sale/itempriceadjust/ItempriceadjustItemprice.java

@@ -140,6 +140,8 @@ public class ItempriceadjustItemprice extends Controller {
             row.put("price4", row.getBigDecimal("price4"));
             row.put("oldprice5", row.getBigDecimal("oldprice5"));
             row.put("price5", row.getBigDecimal("price5"));
+            row.put("oldprice6", row.getBigDecimal("oldprice6"));
+            row.put("price6", row.getBigDecimal("price6"));
         }
         return getSucReturnObject().setData(rows).toString();
     }
@@ -677,7 +679,7 @@ public class ItempriceadjustItemprice extends Controller {
                 } else {
                     datarow.createCell(i1).setCellValue(row.getString((String) keylist.get(i1)));
                 }
-                if (i1 == 7) {
+                if (i1 == 8) {
                     datarow.getCell(i1).setCellStyle(xssfCellStyle1);
                 }
             }