Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-21 4dfe83675fc23f4514b6c3cf44fcc84c7e0b52a8

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

   /**
    * 序号