Merge remote-tracking branch 'origin/div' into div

admin

2020-07-01 055fb8d085efd7e120d69aba6c0fbb8db5867553

 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java

@@ -256,7 +256,7 @@


            if (orderType != null && dateType != null && dateType == 4) {

               if (orderType == 1) {

                  dateType = 6; // 返利订单有效

                  dateType = 6; // 返利订单有效的

               } else {

                  dateType = 5; // 新版查询本月到账

               }