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

无关风月

2025-08-05 9cf6d184a1b8a3a2a951a6842a586906747d46cd

 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SystemPriceMapper.xml

@@ -15,7 +15,7 @@
        select
        id as id,
        content as content
        from t_system_price where companyId = #{companyId}
        from t_system_price where companyId = #{companyId} and state = 1
        <if test="null != type">
            and `type` = #{type}
        </if>