超市分类下拉，菜单增加面包块图片上传

pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierTypeController.java

@@ -127,7 +127,7 @@ public class SmErpSupplierTypeController {
      * 下拉查询
      * @return
      */
-    @Operation(summary = "下拉查询" , description = "分页查询" )
+    @Operation(summary = "下拉查询"  )
     @GetMapping("/simpleAll")
     public R getSimpleAll() {
         List<SmErpSupplierTypeEntity> list = smErpSupplierTypeService.list();

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketCategorySimpleVo.java

@@ -0,0 +1,17 @@
+package com.bsd.pjcloud.supermarket.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class SupermarketCategorySimpleVo {
+
+
+    @Schema(description = "分类id")
+    private Long id;
+
+
+    @Schema(description = "分类名称")
+    private String name;
+}

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketCategoryController.java

@@ -6,10 +6,12 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.supermarket.entity.SupermarketCategoryEntity;
 import com.bsd.pjcloud.supermarket.service.SupermarketCategoryService;
+import com.bsd.pjcloud.supermarket.vo.SupermarketCategorySimpleVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -118,4 +120,17 @@ public class SupermarketCategoryController {
     public List<SupermarketCategoryEntity> export(SupermarketCategoryEntity supermarketCategory,Long[] ids) {
         return supermarketCategoryService.list(Wrappers.lambdaQuery(supermarketCategory).in(ArrayUtil.isNotEmpty(ids), SupermarketCategoryEntity::getId, ids));
     }
+
+
+    /**
+     * 下拉查询
+     * @return
+     */
+    @Operation(summary = "下拉查询")
+    @GetMapping("/simpleAll")
+    public R getSimpleAll() {
+        List<SupermarketCategoryEntity> list = supermarketCategoryService.list();
+        List<SupermarketCategorySimpleVo> bean = BeanUtils.toBean(list, SupermarketCategorySimpleVo.class);
+        return R.ok(bean);
+    }
 }

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysMenu.java

@@ -157,4 +157,7 @@ public class SysMenu extends Model<SysMenu> {
     @Schema(description = "删除标记,1:已删除,0:正常")
     private String delFlag;
 
+
+    @Schema(description = "菜单面包块图标")
+    private String menuPic;
 }

pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysMenuMapper.xml

@@ -38,6 +38,7 @@
 		<result column="del_flag" property="delFlag"/>
 		<result column="embedded" property="embedded"/>
 		<result column="visible" property="visible"/>
+		<result column="menu_pic" property="menuPic"/>
 	</resultMap>
 
 	<!--通过角色查询菜单信息-->
@@ -56,7 +57,8 @@
 			   sys_menu.update_time,
 			   sys_menu.del_flag,
 			   sys_menu.embedded,
-			   sys_menu.visible
+			   sys_menu.visible,
+			   sys_menu.menu_pic
 		FROM sys_menu
 					 LEFT JOIN sys_role_menu ON sys_menu.menu_id = sys_role_menu.menu_id
 		WHERE sys_menu.del_flag = '0'