fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

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

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

   private Long companyId;


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

}