Merge branch 'zx_1026_1111' into test

mec-application/src/main/java/com/ym/mec/web/controller/open/OpenDouble11StaticsController.java

@@ -156,7 +156,7 @@ public class OpenDouble11StaticsController extends BaseController {
         Integer saleStaticsType = query.getSaleStaticsType();
         if (0 == saleStaticsType) { //将不同类型数据汇总
             List<Double11StaticWrapper.SaleAmountAndUser> allResult = new ArrayList<>();
-            for (int i = 1; i <= 6; i++) {
+            for (int i = 1; i <= 7; i++) {
                 query.setSaleStaticsType(i);
                 setQueryParam(query, configParam);
                 List<Double11StaticWrapper.SaleAmountAndUser> oneResult = queryOrgSaleAmount(query, orgIdMap);