状态详情回填

cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableController.java

@@ -9,6 +9,7 @@ import com.czg.account.entity.ShopTable;
 import com.czg.account.service.ShopTableService;
 import com.czg.account.vo.ShopTableVO;
 import com.czg.annotation.SaAdminCheckPermission;
+import com.czg.enums.ShopTableStatusEnum;
 import com.czg.exception.ApiNotPrintException;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
@@ -75,7 +76,9 @@ public class ShopTableController {
         if (StrUtil.isNotBlank(tableCode)) {
             queryWrapper.eq(ShopTable::getTableCode, tableCode);
         }
-        return CzgResult.success(shopTableService.getOne(queryWrapper));
+        ShopTable one = shopTableService.getOne(queryWrapper);
+        one.setStatusMsg(ShopTableStatusEnum.getMsgByValue(one.getStatus()));
+        return CzgResult.success(one);
     }
 
 

cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java

@@ -245,4 +245,13 @@ public class ShopInfoEditDTO {
      * 是否为主店 1-是 0-否
      */
     private Integer isHeadShop;
+    /**
+     * 台桌清理类型 'auto 自动 hand 手动' 默认auto
+     */
+    private String tableClearType;
+    /**
+     * '自动清台 支付几分钟后  默认10分钟后'
+     */
+    private Integer tableClearTime;
+
 }