Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

 smartor/src/main/resources/mapper/smartor/SysUserImportMapper.xml

@@ -116,7 +116,7 @@
    <select id="selectSysUserImportList" parameterType="com.smartor.domain.SysUserImport"
            resultMap="SysUserImportResult">
        <include refid="selectSysUserImportVo"/>
        <where>
        where 1=1
            <if test="subId != null ">
                and sub_id = #{subId}
            </if>
@@ -249,7 +249,6 @@
            <if test="defaultWardName != null  and defaultWardName != ''">
                and default_ward_name = #{defaultWardName}
            </if>
        </where>
    </select>

    <select id="selectSysUserImportById" parameterType="Long"