Merge branch 'api_score_meger' into alpha

Helius

2022-02-14 c34b0342177c90564ee5c9d3ef25c7442aaf71ba

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

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

   private Long companyId;


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

}