Merge remote-tracking branch 'origin/score_shop' into develop

JiangYouYao

2022-03-15 9c5d7547fa9b37c09659c90448ade6df6db4f2de

 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java

@@ -272,6 +272,9 @@

   private Long companyId;


   /**
    * 是否虚拟产品 1/是 2/否
    */
   private Integer isUnrealProduct;

}