Merge branch 'dev-2.0-security' into dev-2.0-auditLog

hs-admin/src/main/resources/mapper/SysUserMapper.xml

@@ -15,6 +15,7 @@
         <result column="PAGE_COUNT" jdbcType="DECIMAL" property="pageCount"/>
         <result column="ERROR_COUNT" jdbcType="DECIMAL" property="errorCount"/>
         <result column="ERROR_TIME" jdbcType="TIMESTAMP" property="errorTime"/>
+        <result column="LAST_UPDATE_PWD_TIME" jdbcType="TIMESTAMP" property="lastUpdatePwdTime"/>
         <result column="LAST_TIME" jdbcType="TIMESTAMP" property="lastTime"/>
         <result column="LAST_IP" jdbcType="VARCHAR" property="lastIp"/>
         <result column="IS_ADMIN" jdbcType="BOOLEAN" property="isAdmin"/>
@@ -120,6 +121,7 @@
                PAGE_COUNT,
                ERROR_COUNT,
                ERROR_TIME,
+               LAST_UPDATE_PWD_TIME,
                LAST_TIME,
                LAST_IP,
                IS_ADMIN