Merge branch 'master' into div

yujian

2019-07-16 a503900f405a39f3aa30a8663ca661cf3c6b55ea

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java

@@ -111,6 +111,9 @@
         String orderNo, String startTime, String endTime, Integer slotTime, boolean needCount, Integer dateType,

         Integer goodsType, PrintWriter out) {



      if (Constant.IS_TEST)

         uid = 389677L;



      if (uid == null) {

         out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

         return;

@@ -403,7 +406,6 @@
               }

            }

         }



      }



      /* 总订单统计 */