Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-08-21 f6f4e7beea525f0c450d618fdc93f112c6813edc

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CancleOrderMapper.xml

@@ -21,6 +21,6 @@
        money as money,
        `type` as `type`,
        orderType as orderType
        from t_sys_cancle_order where `type` = #{type} and orderType = #{orderType} and companyId = #{companyId}
        from t_sys_cancle_order where `type` = #{type} and orderType = #{orderType} and openCityId = #{openCityId}
    </select>
</mapper>