Merge branch 'score_shop' into api_score_meger

Helius

2021-12-30 a282114c4ef2ae2d93df39bad14889b896fbdf80

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

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

   private Long companyId;


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

}