From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1.	新增套餐中有效和无效的操作 2.	会员修改门店功能 3.	套餐新增编辑次数功能 4.	计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5.	打印小票功能调整间距，和收银人 6.	PC端服务单新增划扣金额展示

---
 zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java b/zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java
index c82f43d..c4a5942 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java
@@ -22,10 +22,7 @@
 import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -54,7 +51,7 @@
             @ApiResponse(code = 200, message = "ok", response = OccupancyController.OccupancySPan.class)
     })
     @GetMapping(value = "/getKanban/{timeStr}")
-    AjaxResult showCwzyList(String timeStr) {
+    AjaxResult showCwzyList(@PathVariable String timeStr) {
         //TODO app的用户获不能在session中，方案要改
         SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
         return occupancyController.getCwzyList(timeStr,sysUsers.getShopId());

--
Gitblit v1.9.1