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

jyy

2021-01-26 c62ecf74d20a4338632e454c4f270a739d3d69a1

 zq-erp/src/main/resources/mybatis/mybatis-config.xml

@@ -63,5 +63,6 @@
      <typeAlias alias="ServicesFlow"  type="com.matrix.system.hive.bean.ServicesFlow" />
      <typeAlias alias="VipAnswer"  type="com.matrix.system.hive.bean.VipAnswer" />
      <typeAlias alias="SysWorktime"  type="com.matrix.system.hive.bean.SysWorktime" />
      <typeAlias alias="SysOrderFlow"  type="com.matrix.system.hive.bean.SysOrderFlow" />
   </typeAliases>
</configuration>