Merge remote-tracking branch 'origin/master'

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

@@ -2,7 +2,9 @@ package com.czg.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.czg.account.dto.pad.*;
+import com.czg.account.entity.PadLayout;
 import com.czg.account.entity.PadProductCategoryDetail;
+import com.czg.account.service.PadLayoutService;
 import com.czg.account.service.PadProdService;
 import com.czg.annotation.SaAdminCheckPermission;
 import com.czg.resp.CzgResult;
@@ -25,6 +27,18 @@ import java.util.Map;
 public class PadProdController {
     @Resource
     private PadProdService padProdService;
+    @Resource
+    private PadLayoutService padLayoutService;
+
+    /**
+     * pad布局列表
+     * @return 数据
+     */
+    @SaAdminCheckPermission(value = "padProd:layout:list", name = "pad布局列表")
+    @GetMapping("/layout")
+    public CzgResult<Page<PadLayout>> layout() {
+        return CzgResult.success(padLayoutService.page(PageUtil.buildPage()));
+    }
 
     /**
      * 获取点餐列表

cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java

@@ -34,7 +34,7 @@ public class CzgControllerAdvice {
     public CzgResult<Object> errorHandler(Exception ex) {
         setErrorLog(ex);
         log.error("", ex);
-        return CzgResult.failure(CzgRespCode.SYSTEM_ERROR);
+        return CzgResult.failure(CzgRespCode.SYSTEM_ERROR.getCode(), ex.getMessage());
     }
 
     @ResponseBody

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

@@ -66,7 +66,7 @@ public class PrintMachine implements Serializable {
     /**
      * 店铺Id
      */
-    private String shopId;
+    private Long shopId;
 
     /**
      * 分类Id

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PrintMachineServiceImpl.java

@@ -41,6 +41,7 @@ public class PrintMachineServiceImpl extends ServiceImpl<PrintMachineMapper, Pri
             dto.setCategoryList(null);
         }
         PrintMachine entity = BeanUtil.copyProperties(dto, PrintMachine.class);
+        entity.setShopId(shopId);
         return save(entity);
     }