Merge branch 'bugfix_0725_content' into 'master'

feat: 内容支持自建商品

See merge request !1367

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/goods/GoodsInfoAdaptor.java

@@ -47,8 +47,6 @@ public class GoodsInfoAdaptor {
         GoodsListQDTO searchQdto = new GoodsListQDTO();
         searchQdto.setEnterpriseId(enterpriseId);
         searchQdto.setGoodsNameText(search);
-        // 只查询ERP的
-        searchQdto.setSourceType(1);
         searchQdto.setPageNum(1);
         searchQdto.setPageSize(1000);
         ServiceResponse<Page<GoodsSpuInfoDTO>> serviceResponse = goodsInfoOutApiService.queryGoodsInfoList(searchQdto);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/ContentMaterialInfoVO.java

@@ -99,6 +99,13 @@ public class ContentMaterialInfoVO implements Serializable {
     private Integer duration;
 
 
+    /**
+     * 商品来源
+     * @see com.gic.store.goods.enums.GoodsSourceTypeEnum
+     */
+    private Integer sourceType;
+
+
     public Long getContentMaterialId() {
         return contentMaterialId;
     }
@@ -226,4 +233,12 @@ public class ContentMaterialInfoVO implements Serializable {
     public void setDuration(Integer duration) {
         this.duration = duration;
     }
+
+    public Integer getSourceType() {
+        return sourceType;
+    }
+
+    public void setSourceType(Integer sourceType) {
+        this.sourceType = sourceType;
+    }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/SimpleGoodsInfoVO.java

@@ -66,5 +66,11 @@ public class SimpleGoodsInfoVO implements Serializable {
      */
     private BigDecimal commission;
 
+    /**
+     * 商品来源
+     * @see com.gic.store.goods.enums.GoodsSourceTypeEnum
+     */
+    private Integer sourceType;
+
 }