Merge branch 'ty_fix' into score_shop

Helius

2021-11-30 ba7ef6a2cfeff873da48469cc775c5f928ea45e8

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysInstoreInfo.java

@@ -18,6 +18,7 @@

   private static final long serialVersionUID = 1L;

   public static final String INSTORE_TYPE_RETURN = "退货入库";

   /**
    * 序号