Merge remote-tracking branch 'origin/master'

guyue

1 天以前 41b70b1de21eca6ad2cade92c56ae400386c628b

 src/main/resources/mapper/UserMapper.xml

@@ -12,11 +12,12 @@
            <result property="phone" column="phone" jdbcType="INTEGER"/>
            <result property="sectionalization_id" column="sectionalization_id" jdbcType="INTEGER"/>
            <result property="status" column="status" jdbcType="VARCHAR"/>
            <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <sql id="Base_Column_List">
        user_id,user_name,user_email,
        password,phone,sectionalization_id,status
        password,phone,sectionalization_id,status,create_time
    </sql>
    <select id="getPage" resultType="com.linghu.model.vo.UserPageVO">
        SELECT
@@ -38,6 +39,7 @@
                and u.status = #{status}
            </if>
        </where>
        order by u.create_time
    </select>

</mapper>