Merge branch 'develop' into develop-green

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

@@ -966,11 +966,11 @@ public class cashbill extends Controller {
                 where.append(" and DATE_FORMAT(t1.checkdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate")).append("' ");
             }
         }
-        boolean isExport = content.getBooleanValue("isExport");
+//        boolean isExport = content.getBooleanValue("isExport");
         SQLFactory sqlFactory = new SQLFactory(this, "审核状态的收支凭证详情列表", pageSize, pageNumber, pageSorting);
-        if (isExport) {
-            sqlFactory = new SQLFactory(this, "审核状态的收支凭证详情列表");
-        }
+//        if (isExport) {
+//            sqlFactory = new SQLFactory(this, "审核状态的收支凭证详情列表");
+//        }
         sqlFactory.addParameter_SQL("where", where);
         sqlFactory.addParameter("sa_accountclassid", sa_accountclassid);
         sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);