From aa66729ef758105dc1ced739ffe88e253affc37a Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 16 七月 2019 15:49:28 +0800
Subject: [PATCH] Merge branch 'master-bug'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
index e13d1ac..743d758 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
+++ b/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;
--
Gitblit v1.8.0