Merge branch 'score_shop' into api_score_meger

jyy

2021-09-25 4f4fd43c199ff802df896256bc012a7277fdd4a1

 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 = "退货入库";

   /**
    * 序号