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

jyy

2021-01-26 c62ecf74d20a4338632e454c4f270a739d3d69a1

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

   /**
    * 序号