Merge branch 'zigonggao_dev' into huacheng_test

lidongdong

2022-09-26 42cab033b97de6a7309cc9ef7370615b59647305

Merge branch 'zigonggao_dev' into huacheng_test

# Conflicts:
#	flower_city/src/main/resources/application.properties

 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -74,13 +74,12 @@
    </sql>


    <select id="selectNum" resultType="integer">
        select count(user_id) from sys_user
    <select id="selectNum" parameterType="string" resultType="integer">
        select count(user_id) from automessage_sys_user
        <where>
            <if test="userType != null and userType != ''">
                AND user_type=#{userType}
            </if>

        </where>
    </select>