Merge branch 'bugfix-20240417' into 'developer'

新增goodsId参数

See merge request !1699

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentMaterialController.java

@@ -132,6 +132,7 @@ public class ContentMaterialController {
         pageQDTO.setContentColumnId(contentMaterialQO.getContentColumnId());
         pageQDTO.setMaterialType(contentMaterialQO.getMaterialType());
         pageQDTO.setClerkId(contentMaterialQO.getClerkId());
+        pageQDTO.setGoodsId(contentMaterialQO.getGoodsId());
 
         if (contentMaterialQO.getSortType() != null) {
             if (contentMaterialQO.getSortType() == 2) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/ContentMaterialQO.java

@@ -63,6 +63,11 @@ public class ContentMaterialQO extends PageQo {
      */
     private Integer searchType;
 
+    /**
+     * 商品id
+     */
+    private String goodsId;
+
     public Integer getQueryScene() {
         return queryScene;
     }
@@ -142,4 +147,12 @@ public class ContentMaterialQO extends PageQo {
     public void setSearchType(Integer searchType) {
         this.searchType = searchType;
     }
+
+    public String getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(String goodsId) {
+        this.goodsId = goodsId;
+    }
 }