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

jyy

2021-04-20 fa791f7796c1546b1329b52a3de8d753915cb4d5

 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>