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

jyy

2021-01-15 1bb16954b0630bd078483c06b26e835918ab7946

 zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml

@@ -1318,5 +1318,7 @@
   where id=#{id}
   </update>


    <select id="selectAppVersion" resultType="com.matrix.system.hive.bean.AppVersion">
        select * from app_version
    </select>
</mapper>