Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

935090232@qq.com

2022-01-24 4915156f5e5b321a48eba19746bbcc740f34a881

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

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

   private Long companyId;


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

}