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()));
+    }
 
     /**
      * 获取点餐列表