解决商品的bug

src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java

@@ -50,6 +50,10 @@ public class MaterialVo4Unit {
 
     private String unitName;
 
+    private String categoryName;
+
+    private String materialOther;
+
     public Long getId() {
         return id;
     }
@@ -241,4 +245,20 @@ public class MaterialVo4Unit {
     public void setUnitName(String unitName) {
         this.unitName = unitName;
     }
+
+    public String getCategoryName() {
+        return categoryName;
+    }
+
+    public void setCategoryName(String categoryName) {
+        this.categoryName = categoryName;
+    }
+
+    public String getMaterialOther() {
+        return materialOther;
+    }
+
+    public void setMaterialOther(String materialOther) {
+        this.materialOther = materialOther;
+    }
 }

src/main/java/com/jsh/erp/datasource/mappers/MaterialMapper.java

@@ -96,15 +96,21 @@ public interface MaterialMapper {
      */
     int updateByPrimaryKey(Material record);
 
-    List<Material> selectByConditionMaterial(
+    List<MaterialVo4Unit> selectByConditionMaterial(
             @Param("name") String name,
             @Param("model") String model,
+            @Param("categoryId") Long categoryId,
+            @Param("categoryIds") String categoryIds,
+            @Param("mpList") String mpList,
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
     int countsByMaterial(
             @Param("name") String name,
-            @Param("model") String model);
+            @Param("model") String model,
+            @Param("categoryId") Long categoryId,
+            @Param("categoryIds") String categoryIds,
+            @Param("mpList") String mpList);
 
     String findUnitName(@Param("mId") Long mId);