Merge remote-tracking branch 'origin/master'

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

@@ -33,7 +33,7 @@ public class ShopInfoController {
      * 权限标识: shopInfo:list
      */
     @SaAdminCheckRole("管理员")
-    @SaAdminCheckPermission("shopInfo:list")
+    @SaAdminCheckPermission(value = "shopInfo:list", name = "店铺列表")
     @GetMapping
     public CzgResult<Page<ShopInfo>> get(PageDTO pageDTO, String shopName, Integer status) {
         return CzgResult.success(shopInfoService.get(pageDTO, shopName, status));
@@ -57,7 +57,7 @@ public class ShopInfoController {
      * 权限标识: shopInfo:add
      */
     @SaAdminCheckRole("管理员")
-    @SaAdminCheckPermission("shopInfo:add")
+    @SaAdminCheckPermission(value = "shopInfo:add", name = "店铺添加")
     @PostMapping
     public CzgResult<?> add(@RequestBody @Validated ShopInfoAddDTO shopInfoAddDTO) {
         return CzgResult.success(shopInfoService.add(shopInfoAddDTO));
@@ -68,7 +68,7 @@ public class ShopInfoController {
      * 权限标识: shopInfo:edit
      */
     @SaAdminCheckRole("管理员")
-    @SaAdminCheckPermission("shopInfo:edit")
+    @SaAdminCheckPermission(value = "shopInfo:edit", name = "店铺编辑")
     @PutMapping
     public CzgResult<?> edit(@RequestBody @Validated ShopInfoEditDTO shopInfoEditDTO) {
         return CzgResult.success(shopInfoService.edit(shopInfoEditDTO));
@@ -79,7 +79,7 @@ public class ShopInfoController {
      * 权限标识: shopInfo:del
      */
     @SaAdminCheckRole("管理员")
-    @SaAdminCheckPermission("shopInfo:del")
+    @SaAdminCheckPermission(value = "shopInfo:del", name = "店铺删除")
     @DeleteMapping
     public CzgResult<?> delete(@RequestParam Integer shopId) {
         return CzgResult.success(shopInfoService.remove(new QueryWrapper().eq(ShopInfo::getId, shopId)));

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

@@ -1,9 +1,12 @@
 package com.czg.controller.admin;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.czg.account.dto.staff.ShopStaffAddDTO;
 import com.czg.account.dto.staff.ShopStaffEditDTO;
 import com.czg.account.dto.staff.ShopStaffRemoveDTO;
+import com.czg.account.entity.ShopInfo;
 import com.czg.account.entity.ShopStaff;
+import com.czg.account.service.ShopInfoService;
 import com.czg.account.service.ShopStaffService;
 import com.czg.annotation.SaAdminCheckPermission;
 import com.czg.resp.CzgResult;
@@ -27,6 +30,8 @@ public class ShopStaffController {
 
     @Resource
     private ShopStaffService shopStaffService;
+    @Resource
+    private ShopInfoService shopInfoService;
 
     /**
      * 员工列表
@@ -35,7 +40,7 @@ public class ShopStaffController {
      * @param code 员工编号
      * @return 分页数据
      */
-    @SaAdminCheckPermission("shopStaff:list")
+    @SaAdminCheckPermission(value = "shopStaff:list", name = "员工列表")
     @GetMapping
     public CzgResult<Page<ShopStaff>> list(String name, String code) {
         return CzgResult.success(shopStaffService.get(name, code));
@@ -46,7 +51,7 @@ public class ShopStaffController {
      * 权限标识: shopStaff:permission
      * @return 权限id集合
      */
-    @SaAdminCheckPermission("shopStaff:permission")
+    @SaAdminCheckPermission(value = "shopStaff:permission", name =  "获取员工对应的权限id")
     @GetMapping("/permission")
     public CzgResult<List<Long>> permission(@RequestParam Long id) {
         return CzgResult.success(shopStaffService.permission(id));
@@ -62,7 +67,8 @@ public class ShopStaffController {
             return CzgResult.success(shopStaffService.getOne(new QueryWrapper().eq(ShopStaff::getShopId, StpKit.USER.getShopId()).eq(ShopStaff::getId, StpKit.USER.getLoginIdAsLong())));
         }
 
-        return CzgResult.success();
+        ShopInfo shopInfo = shopInfoService.getById(StpKit.USER.getShopId());
+        return CzgResult.success(BeanUtil.copyProperties(shopInfo, ShopStaff.class));
     }
 
     /**
@@ -71,7 +77,7 @@ public class ShopStaffController {
      * @param id shopStaff id
      * @return 详细信息
      */
-    @SaAdminCheckPermission("shopStaff:detail")
+    @SaAdminCheckPermission(value = "shopStaff:detail", name = "员工详情")
     @GetMapping("/detail")
     public CzgResult<ShopStaff> detail(@RequestParam Long id) {
         return CzgResult.success(shopStaffService.detail(StpKit.USER.getShopId(), id));
@@ -83,7 +89,7 @@ public class ShopStaffController {
      * @param shopStaffAddDTO 添加信息
      * @return 是否成功
      */
-    @SaAdminCheckPermission("shopStaff:add")
+    @SaAdminCheckPermission(value = "shopStaff:add", name = "员工添加")
     @PostMapping
     public CzgResult<Boolean> add(@RequestBody @Validated ShopStaffAddDTO shopStaffAddDTO) {
         return CzgResult.success(shopStaffService.add(shopStaffAddDTO));
@@ -95,7 +101,7 @@ public class ShopStaffController {
      * @param shopStaffEditDTO 添加信息
      * @return 是否成功
      */
-    @SaAdminCheckPermission("shopStaff:edit")
+    @SaAdminCheckPermission(value = "shopStaff:edit", name = "员工修改")
     @PutMapping
     public CzgResult<Boolean> edit(@RequestBody @Validated ShopStaffEditDTO shopStaffEditDTO) {
         return CzgResult.success(shopStaffService.edit(shopStaffEditDTO));
@@ -107,7 +113,7 @@ public class ShopStaffController {
      * @param shopStaffRemoveDTO 删除信息
      * @return 是否成功
      */
-    @SaAdminCheckPermission("shopStaff:del")
+    @SaAdminCheckPermission(value = "shopStaff:del", name = "员工删除")
     @DeleteMapping
     public CzgResult<Boolean> delete(@RequestBody @Validated ShopStaffRemoveDTO shopStaffRemoveDTO) {
         return CzgResult.success(shopStaffService.delete(shopStaffRemoveDTO));

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

@@ -36,7 +36,7 @@ public class ShopTableController {
      * 批量生成台桌码
      * 权限标识: shopTable:code
      */
-    @SaAdminCheckPermission("shopTable:code")
+    @SaAdminCheckPermission(value = "shopTable:code", name = "生成台桌码")
     @PostMapping("/code")
     public void createCode(@RequestParam Integer num, HttpServletResponse response, HttpServletRequest request) throws IOException {
         if (num > 100) {
@@ -53,10 +53,10 @@ public class ShopTableController {
      * @param status 台桌状态
      * @return 台桌列表
      */
-    @SaAdminCheckPermission("shopTable:list")
+    @SaAdminCheckPermission(value = "shopTable:list", name = "获取台桌列表")
     @GetMapping
-    public CzgResult<Page<ShopTableVO>> list(Integer areaId, String tableCode, String status, String name) {
-        return CzgResult.success(shopTableService.pageInfo(StpKit.USER.getShopId(), areaId, tableCode, status, name));
+    public CzgResult<Page<ShopTableVO>> list(Integer areaId, String tableCode, String status, String name, Boolean isBind) {
+        return CzgResult.success(shopTableService.pageInfo(StpKit.USER.getShopId(), areaId, tableCode, status, name, isBind));
     }
 
     /**
@@ -65,7 +65,7 @@ public class ShopTableController {
      * @param id 台桌id
      * @return 台桌列表
      */
-    @SaAdminCheckPermission("shopTable:detail")
+    @SaAdminCheckPermission(value = "shopTable:detail", name = "获取台桌详情")
     @GetMapping("/detail")
     public CzgResult<ShopTable> detail(Long id, String tableCode) {
         if (id == null && StrUtil.isBlank(tableCode)) {
@@ -84,7 +84,7 @@ public class ShopTableController {
      * 权限标识: shopTable:edit
      * @return 是否成功
      */
-    @SaAdminCheckPermission("shopTable:edit")
+    @SaAdminCheckPermission(value = "shopTable:edit", name = "台桌信息修改")
     @PutMapping
     public CzgResult<Boolean> edit(@RequestBody @Validated ShopTableDTO shopTableDTO) {
         return CzgResult.success(shopTableService.updateInfo(StpKit.USER.getLoginIdAsLong(), shopTableDTO));
@@ -95,7 +95,7 @@ public class ShopTableController {
      * 权限标识: shopTable:clear
      * @return 是否成功
      */
-    @SaAdminCheckPermission("shopTable:clear")
+    @SaAdminCheckPermission(value = "shopTable:clear", name = "台桌清台")
     @PutMapping("/clear")
     public CzgResult<Boolean> clear(@RequestBody @Validated ShopTableClearDTO shopTableClearDTO) {
         return CzgResult.success(shopTableService.clear(StpKit.USER.getLoginIdAsLong(), shopTableClearDTO));
@@ -106,7 +106,7 @@ public class ShopTableController {
      * 权限标识: shopTable:del
      * @return 是否成功
      */
-    @SaAdminCheckPermission("shopTable:del")
+    @SaAdminCheckPermission(value = "shopTable:del", name = "台桌信息删除")
     @DeleteMapping
     public CzgResult<Boolean> remove(@RequestBody @Validated ShopTableDTO shopTableDTO) {
         return CzgResult.success(shopTableService.remove(new QueryWrapper().eq(ShopTable::getShopId, StpKit.USER.getShopId()).eq(ShopTable::getId, shopTableDTO.getId())));
@@ -117,7 +117,7 @@ public class ShopTableController {
      * 权限标识: shopTable:add
      * @return 是否成功
      */
-    @SaAdminCheckPermission("shopTable:add")
+    @SaAdminCheckPermission(value = "shopTable:add", name = "台桌信息增加")
     @PostMapping
     public CzgResult<Boolean> add(@RequestBody @Validated ShopTableAddDTO shopTableAddDTO) {
         if (shopTableAddDTO.getStart() >= shopTableAddDTO.getEnd()){
@@ -131,7 +131,7 @@ public class ShopTableController {
      * 权限标识: shopTable:bind
      * @return 是否成功
      */
-    @SaAdminCheckPermission("shopTable:bind")
+    @SaAdminCheckPermission(value = "shopTable:bind", name = "台桌绑定")
     @PostMapping("/bind")
     public CzgResult<Boolean> bind(@RequestBody @Validated ShopTableBindDTO shopTableBindDTO) {
         return CzgResult.success(shopTableService.bind(StpKit.USER.getShopId(), shopTableBindDTO));

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

@@ -6,7 +6,6 @@ import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,7 +16,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-21
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class MqLogDTO implements Serializable {

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

@@ -7,7 +7,6 @@ import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -18,7 +17,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-24
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class OrderDetailDTO implements Serializable {

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

@@ -8,7 +8,6 @@ import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -19,7 +18,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-24
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class OrderInfoDTO implements Serializable {

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

@@ -6,7 +6,6 @@ import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,7 +16,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-20
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class PadLayoutDTO implements Serializable {

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

@@ -6,7 +6,6 @@ import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,7 +16,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-20
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class PadProductCategoryDetailDTO implements Serializable {

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

@@ -4,7 +4,6 @@ package com.czg.account.dto;
 import java.io.Serializable;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -15,7 +14,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-28
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class PlatformDictDTO implements Serializable {

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

@@ -4,7 +4,6 @@ package com.czg.account.dto;
 import java.io.Serializable;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -15,7 +14,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-28
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class PlatformDictTypeDTO implements Serializable {

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

@@ -8,7 +8,6 @@ import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -19,7 +18,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-20
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ProductDTO implements Serializable {

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

@@ -7,7 +7,6 @@ import com.czg.validator.group.InsertGroup;
 import com.czg.validator.group.UpdateGroup;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -25,7 +24,7 @@ import java.util.List;
  * @since 2025-02-20
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopActivateDTO implements Serializable {

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

@@ -3,7 +3,6 @@ package com.czg.account.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -19,7 +18,7 @@ import java.time.LocalDateTime;
  * @since 2025-02-17
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopCouponDTO implements Serializable {

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

@@ -3,7 +3,6 @@ package com.czg.account.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -18,7 +17,7 @@ import java.time.LocalDateTime;
  * @since 2025-02-18
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopCouponProductDTO implements Serializable {

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

@@ -6,7 +6,6 @@ import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,7 +16,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-07
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopMsgStateDTO implements Serializable {

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

@@ -1,14 +1,11 @@
 
 package com.czg.account.dto;
 
-import java.io.Serializable;
-import java.io.Serial;
-import java.time.LocalDateTime;
-
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import java.io.Serial;
+import java.io.Serializable;
 
 /**
  * 店铺支付类型 实体类。
@@ -17,7 +14,6 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-26
  */
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopPayTypeDTO implements Serializable {

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

@@ -6,7 +6,6 @@ import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,7 +16,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-18
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopPermissionDTO implements Serializable {

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

@@ -6,7 +6,6 @@ import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,7 +16,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-20
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopProdCategoryDTO implements Serializable {

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

@@ -6,7 +6,6 @@ import java.math.BigDecimal;
 import java.sql.Date;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,7 +16,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-06
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopProdStatisticDTO implements Serializable {

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

@@ -6,7 +6,6 @@ import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,7 +16,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-03
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopPushOpenIdDTO implements Serializable {

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

@@ -9,7 +9,6 @@ import java.util.List;
 
 import jakarta.validation.constraints.Size;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -20,7 +19,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-05
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopShareDTO implements Serializable {

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

@@ -6,7 +6,6 @@ import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,7 +16,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-05
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopShareRecordDTO implements Serializable {

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

@@ -4,7 +4,6 @@ package com.czg.account.dto;
 import java.io.Serializable;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -15,7 +14,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-18
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopStaffPermissionDTO implements Serializable {

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

@@ -6,7 +6,6 @@ import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,7 +16,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-27
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopStorageDTO implements Serializable {

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

@@ -6,7 +6,6 @@ import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,7 +16,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-19
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopTableCodeDTO implements Serializable {

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

@@ -7,7 +7,6 @@ import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -18,7 +17,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-03
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopTableOrderStatisticDTO implements Serializable {

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

@@ -6,7 +6,6 @@ import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,7 +16,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-28
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class SysDictDTO implements Serializable {

cash-common/cash-common-service/src/main/java/com/czg/account/dto/ad/ShopAdDTO.java

@@ -1,20 +1,16 @@
 
 package com.czg.account.dto.ad;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import com.alibaba.fastjson2.annotation.JSONField;
-import java.io.Serial;
-
 import com.czg.validator.group.InsertGroup;
 import com.czg.validator.group.UpdateGroup;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+
 /**
  * 店铺广告 实体类。
  *
@@ -22,7 +18,6 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-26
  */
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopAdDTO implements Serializable {

cash-common/cash-common-service/src/main/java/com/czg/account/dto/area/ShopAreaAddDTO.java

@@ -2,11 +2,7 @@
 package com.czg.account.dto.area;
 
 import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 

cash-common/cash-common-service/src/main/java/com/czg/account/dto/area/ShopAreaEditDTO.java

@@ -1,15 +1,13 @@
 
 package com.czg.account.dto.area;
 
-import java.io.Serializable;
-import java.io.Serial;
-
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+
 /**
  * 店铺区域 实体类。
  *
@@ -17,7 +15,6 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-18
  */
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopAreaEditDTO implements Serializable {

cash-common/cash-common-service/src/main/java/com/czg/account/dto/extend/ShopExtendDTO.java

@@ -1,18 +1,12 @@
 
 package com.czg.account.dto.extend;
 
-import com.alibaba.fastjson2.annotation.JSONField;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serial;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
  * 店铺扩展信息 实体类。
  *
@@ -20,7 +14,6 @@ import java.time.LocalDateTime;
  * @since 2025-02-19
  */
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopExtendDTO {

cash-common/cash-common-service/src/main/java/com/czg/account/dto/flow/ShopUserFlowDTO.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson2.annotation.JSONField;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import java.time.LocalDateTime;
  * @since 2025-02-13
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopUserFlowDTO implements Serializable {

cash-common/cash-common-service/src/main/java/com/czg/account/dto/pad/PadLayoutAddDTO.java

@@ -1,15 +1,10 @@
 
 package com.czg.account.dto.pad;
 
-import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-
-import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -19,7 +14,7 @@ import java.util.List;
  * @since 2025-02-20
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class PadLayoutAddDTO implements Serializable {

cash-common/cash-common-service/src/main/java/com/czg/account/dto/paytype/ShopPayTypeAddDTO.java

@@ -3,15 +3,10 @@ package com.czg.account.dto.paytype;
 
 import com.czg.validator.group.InsertGroup;
 import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.Size;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serial;
-import java.io.Serializable;
-
 /**
  * 店铺支付类型 实体类。
  *
@@ -19,7 +14,6 @@ import java.io.Serializable;
  * @since 2025-02-26
  */
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopPayTypeAddDTO {

cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserMoneyEditDTO.java

@@ -4,8 +4,8 @@ import com.czg.enums.ShopUserFlowBizEnum;
 import jakarta.validation.constraints.DecimalMax;
 import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.NotNull;
-import lombok.Builder;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * @author Administrator
  */
 @Data
-@Builder
+@Accessors(chain = true)
 public class ShopUserMoneyEditDTO implements Serializable {
     /**
      * 对应shopUserid

cash-common/cash-common-service/src/main/java/com/czg/account/dto/song/BaseShopSongDTO.java

@@ -1,15 +1,8 @@
 
 package com.czg.account.dto.song;
 
-import jakarta.validation.constraints.DecimalMin;
-import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-import lombok.Builder;
 import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
 
 /**
  * 点歌-歌曲表 实体类。

cash-common/cash-common-service/src/main/java/com/czg/account/dto/song/ShopSongAddDTO.java

@@ -1,22 +1,15 @@
 
 package com.czg.account.dto.song;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import com.alibaba.fastjson2.annotation.JSONField;
-import java.io.Serial;
-
 import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+
 /**
  * 点歌-歌曲表 实体类。
  *
@@ -24,7 +17,6 @@ import lombok.experimental.Accessors;
  * @since 2025-03-01
  */
 @Data
-@Builder
 @Accessors(chain = true)
 public class ShopSongAddDTO{
 

cash-common/cash-common-service/src/main/java/com/czg/account/dto/song/ShopSongEditDTO.java

@@ -1,8 +1,9 @@
 
 package com.czg.account.dto.song;
 
-import jakarta.validation.constraints.*;
-import lombok.Builder;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -17,7 +18,7 @@ import java.math.BigDecimal;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@Builder
+
 @Accessors(chain = true)
 public class ShopSongEditDTO extends BaseShopSongDTO {
     /**

cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableClearDTO.java

@@ -3,13 +3,11 @@ package com.czg.account.dto.table;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * 台桌配置 实体类。
@@ -18,7 +16,6 @@ import java.math.BigDecimal;
  * @since 2025-02-13
  */
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopTableClearDTO implements Serializable {

cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableDTO.java

@@ -1,17 +1,13 @@
 
 package com.czg.account.dto.table;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import com.alibaba.fastjson2.annotation.JSONField;
-import java.io.Serial;
-
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 台桌配置 实体类。
@@ -20,7 +16,6 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-13
  */
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopTableDTO implements Serializable {

cash-common/cash-common-service/src/main/java/com/czg/account/entity/CallConfig.java

@@ -10,7 +10,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-21
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_call_config")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/CallQueue.java

@@ -10,7 +10,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-21
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_call_queue")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/CallTable.java

@@ -10,7 +10,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-21
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_call_table")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java

@@ -11,7 +11,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -22,7 +21,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-21
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_free_dine_config")
@@ -64,9 +63,9 @@ public class FreeDineConfig implements Serializable {
      */
     private String rechargeDesc;
 
-    /**
-     * 使用类型 dine-in店内 takeout 自取 post快递，takeaway外卖
-     */
+//    /**
+//     * 使用类型 dine-in店内 takeout 自取 post快递，takeaway外卖
+//     */
 //    private String useType;
 
     /**

cash-common/cash-common-service/src/main/java/com/czg/account/entity/MerchantRegister.java

@@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import java.time.LocalDateTime;
  * @since 2025-02-11
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_merchant_register")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/PadLayout.java

@@ -10,7 +10,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-20
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_pad_layout")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/PadProductCategory.java

@@ -10,7 +10,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -22,7 +21,7 @@ import lombok.experimental.Accessors;
  * @since 2025-02-20
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_pad_product_category")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/PadProductCategoryDetail.java

@@ -10,7 +10,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -22,7 +21,7 @@ import lombok.experimental.Accessors;
  * @since 2025-02-20
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_pad_product_category_detail")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/PlatformDict.java

@@ -8,7 +8,6 @@ import java.io.Serializable;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -19,7 +18,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-28
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_platform_dict")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/PlatformDictType.java

@@ -8,7 +8,6 @@ import java.io.Serializable;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -19,7 +18,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-28
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_platform_dict_type")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/PointsBasicSetting.java

@@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import java.time.LocalDateTime;
  * @since 2025-02-20
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_points_basic_setting")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/PrintMachine.java

@@ -11,7 +11,6 @@ import java.io.Serial;
 import java.util.List;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -22,7 +21,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-20
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_print_machine")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopActivate.java

@@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import java.time.LocalDateTime;
  * @since 2025-02-20
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_activate")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopActivateCouponRecord.java

@@ -12,7 +12,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -23,7 +22,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-20
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_activate_coupon_record")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopAd.java

@@ -10,7 +10,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-26
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_ad")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopCoupon.java

@@ -12,7 +12,6 @@ import java.io.Serial;
 import java.time.LocalTime;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -23,7 +22,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-20
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_coupon")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopExtend.java

@@ -11,7 +11,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -22,7 +21,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-19
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_extend")
@@ -80,7 +79,6 @@ public class ShopExtend implements Serializable {
      * my_bg：  我的页面背景图
      * member_bg：会员卡页面背景图
      * shopinfo_bg：商品列表顶部背景图
-     * @param autokey
      */
     public void initAutoKey(String autokey,long shopId) {
         if (StrUtil.isBlank(name)) {

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java

@@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import java.time.LocalDateTime;
  * @since 2025-02-10
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_info")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopMerchant.java

@@ -4,7 +4,6 @@ import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -19,7 +18,7 @@ import java.time.LocalDateTime;
  * @since 2025-02-11
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_merchant")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopMsgState.java

@@ -10,7 +10,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-07
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_msg_state")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopPayType.java

@@ -10,7 +10,6 @@ import java.io.Serial;
 import java.time.LocalDateTime;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -22,7 +21,7 @@ import lombok.experimental.Accessors;
  * @since 2025-02-26
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Accessors(chain = true)

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopPermission.java

@@ -11,7 +11,6 @@ import java.io.Serial;
 import java.util.List;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -22,7 +21,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-18
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_permission")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopProdCategory.java

@@ -10,7 +10,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-20
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_prod_category")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopProdStatistic.java

@@ -10,7 +10,6 @@ import java.sql.Date;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-06
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_prod_statistic")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopPushOpenId.java

@@ -1,20 +1,15 @@
 package com.czg.account.entity;
 
-import com.alibaba.fastjson2.annotation.JSONField;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import java.io.Serial;
-import java.util.List;
-
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * 用户推送信息表 实体类。
@@ -23,7 +18,6 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-03
  */
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_push_open_id")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopShare.java

@@ -9,7 +9,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -20,7 +19,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-05
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_share")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopShareRecord.java

@@ -10,7 +10,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-05
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_share_record")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopSong.java

@@ -11,7 +11,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -22,7 +21,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-01
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_song")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopStaff.java

@@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import java.time.LocalDateTime;
  * @since 2025-02-10
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_staff")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopStaffPermission.java

@@ -8,7 +8,6 @@ import java.io.Serializable;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -19,7 +18,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-18
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_staff_permission")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java

@@ -12,7 +12,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -23,7 +22,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-13
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_table")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableArea.java

@@ -10,7 +10,6 @@ import java.io.Serial;
 import java.time.LocalDateTime;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-18
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_table_area")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableCode.java

@@ -10,7 +10,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -22,7 +21,7 @@ import lombok.experimental.Accessors;
  * @since 2025-02-19
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_table_code")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableOrderStatistic.java

@@ -4,17 +4,14 @@ import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.sql.Date;
-import java.time.LocalDateTime;
-
-import java.io.Serial;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
  * 台桌订单统计表 实体类。
@@ -23,7 +20,6 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-03
  */
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_table_order_statistic")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java

@@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import java.time.LocalDateTime;
  * @since 2025-02-08
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_user")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUserFlow.java

@@ -12,7 +12,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -23,7 +22,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-13
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_user_flow")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysDict.java

@@ -4,18 +4,15 @@ import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import java.io.Serial;
-import java.util.ArrayList;
-import java.util.List;
-
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * 数据字典 实体类。
  *
@@ -23,7 +20,6 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-28
  */
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("sys_dict")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysMenu.java

@@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -20,7 +19,7 @@ import java.time.LocalDateTime;
  * @since 2025-02-10
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("sys_menu")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysRole.java

@@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -20,7 +19,7 @@ import java.time.LocalDateTime;
  * @since 2025-02-08
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("sys_role")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysRolesMenus.java

@@ -3,7 +3,6 @@ package com.czg.account.entity;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,7 +16,7 @@ import java.io.Serializable;
  * @since 2025-02-10
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("sys_roles_menus")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysUser.java

@@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -20,7 +19,7 @@ import java.time.LocalDateTime;
  * @since 2025-02-08
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("sys_user")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysUsersRoles.java

@@ -3,7 +3,6 @@ package com.czg.account.entity;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,7 +16,7 @@ import java.io.Serializable;
  * @since 2025-02-10
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("sys_users_roles")

cash-common/cash-common-service/src/main/java/com/czg/account/entity/UserInfo.java

@@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -20,7 +19,7 @@ import java.time.LocalDateTime;
  * @since 2025-02-11
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_user_info")

cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopTableService.java

@@ -35,5 +35,5 @@ public interface ShopTableService extends IService<ShopTable> {
 
     Boolean clear(long shopId, ShopTableClearDTO shopTableClearDTO);
 
-    Page<ShopTableVO> pageInfo(Long shopId, Integer areaId, String tableCode, String status, String name);
+    Page<ShopTableVO> pageInfo(Long shopId, Integer areaId, String tableCode, String status, String name, Boolean isBind);
 }

cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java

@@ -3,7 +3,6 @@ package com.czg.order.dto;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -19,7 +18,7 @@ import java.util.List;
  * @since 2025-02-13
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class CheckOrderPay implements Serializable {

cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoAddDTO.java

@@ -4,7 +4,6 @@ package com.czg.order.dto;
 import cn.hutool.core.util.StrUtil;
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -18,7 +17,7 @@ import java.math.BigDecimal;
  * @since 2025-02-13
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class OrderInfoAddDTO implements Serializable {

cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoDTO.java

@@ -10,7 +10,6 @@ import com.alibaba.fastjson2.annotation.JSONField;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-13
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class OrderInfoDTO implements Serializable {

cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoQueryDTO.java

@@ -2,7 +2,6 @@
 package com.czg.order.dto;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -15,7 +14,7 @@ import java.io.Serializable;
  * @since 2025-02-13
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class OrderInfoQueryDTO implements Serializable {

cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoRefundDTO.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import com.czg.order.entity.OrderDetail;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -20,7 +19,7 @@ import java.util.List;
  * @since 2025-02-13
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class OrderInfoRefundDTO implements Serializable {

cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoUpDTO.java

@@ -4,7 +4,6 @@ package com.czg.order.dto;
 import com.czg.order.entity.OrderDetail;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -18,7 +17,7 @@ import java.util.List;
  * @since 2025-02-13
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class OrderInfoUpDTO implements Serializable {

cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopOrderStatisticDTO.java

@@ -6,7 +6,6 @@ import java.math.BigDecimal;
 import java.sql.Date;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,7 +16,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-07
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopOrderStatisticDTO implements Serializable {

cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopProdStatisticDTO.java

@@ -6,7 +6,6 @@ import java.math.BigDecimal;
 import java.sql.Date;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,7 +16,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-07
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopProdStatisticDTO implements Serializable {

cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopTableOrderStatisticDTO.java

@@ -6,7 +6,6 @@ import java.math.BigDecimal;
 import java.sql.Date;
 import java.io.Serial;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -17,7 +16,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-07
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 public class ShopTableOrderStatisticDTO implements Serializable {

cash-common/cash-common-service/src/main/java/com/czg/order/entity/CashierCart.java

@@ -5,7 +5,6 @@ import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import java.time.LocalDateTime;
  * @since 2025-02-20
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_cashier_cart")

cash-common/cash-common-service/src/main/java/com/czg/order/entity/MqLog.java

@@ -4,7 +4,6 @@ import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -20,7 +19,7 @@ import java.time.LocalDateTime;
  * @since 2025-02-21
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_mq_log")

cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java

@@ -6,7 +6,6 @@ import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -22,7 +21,7 @@ import java.time.LocalDateTime;
  * @since 2025-02-14
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_order_detail")

cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java

@@ -13,7 +13,6 @@ import java.time.LocalDateTime;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -24,7 +23,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-02-13
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_order_info")

cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java

@@ -10,7 +10,6 @@ import java.sql.Date;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-07
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_order_statistic")

cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopProdStatistic.java

@@ -10,7 +10,6 @@ import java.sql.Date;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-07
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_prod_statistic")

cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopTableOrderStatistic.java

@@ -10,7 +10,6 @@ import java.sql.Date;
 import java.io.Serial;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -21,7 +20,7 @@ import lombok.NoArgsConstructor;
  * @since 2025-03-07
  */
 @Data
-@Builder
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_table_order_statistic")