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

puzhibing

2023-06-08 d77aa9268ed02e7bda8a67aab2213e42cb5afcf4

 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/CommercialMapper.xml

@@ -30,7 +30,7 @@
        jumpType,
        jumpUrl,
        html
        from t_commercial where status = 1
        from t_commercial where status = 1 and onOffLine = 1
        <if test="null != type">
            and `type` = #{type}
        </if>