Merge branch 'ww' into test

eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockCountQueryCriteria.java

@@ -22,10 +22,21 @@ public class TbProductStockCountQueryCriteria extends BaseQueryDto {
 
     private Integer size = 10;
 
-    public String getProductName() {
-        if(StringUtils.isNotBlank(productName)){
-            return productName;
+    public void setProductId(String productId) {
+        if (StringUtils.isNotBlank(productId)) {
+            this.productId = productId;
+        }
+    }
+
+    public void setProductName(String productName) {
+        if (StringUtils.isNotBlank(productName)) {
+            this.productName = productName;
+        }
+    }
+
+    public void setCategoryId(String categoryId) {
+        if (StringUtils.isNotBlank(categoryId)) {
+            this.categoryId = categoryId;
         }
-        return null;
     }
 }