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/SystemPriceMapper.xml

@@ -26,7 +26,7 @@
        isOpen as isOpen,
        isOpenExclusive as isOpenExclusive,
        isOpenPrice as isOpenPrice
        from t_system_price where state = 1 and companyId = #{companyId}
        from t_system_price where state = 1
        <if test="null != type">
            and `type` = #{type}
        </if>