Merge branch 'feature/租赁物及报价修改' into develop

src/main/resources/spring/standardSecurity.xml

@@ -106,8 +106,8 @@
         <!-- <authentication-provider ref="ldapAuthProvider" />-->
         <!--标准登录验证-->
         <!--生成开发此处不同 add chenlingfeng for ds-->
-        <authentication-provider user-service-ref="customUserDetailsService">
-        <!--<authentication-provider user-service-ref="leafUserDetailsService">-->
+        <!--<authentication-provider user-service-ref="customUserDetailsService">-->
+        <authentication-provider user-service-ref="leafUserDetailsService">
             <password-encoder ref="passwordManager"/>
         </authentication-provider>
     </authentication-manager>

src/main/webapp/WEB-INF/classes/sys/sys_user.lwm

@@ -5,6 +5,7 @@
         <ns1:field name="user_name" databaseType="VARCHAR" datatype="java.lang.String" prompt="SYS_USER.ACCOUNT"/>
         <ns1:field name="encrypted_foundation_password" databaseType="VARCHAR" datatype="java.lang.String" forSelect="false" insertExpression="sys_login_pkg.md5(${@password})"/>
         <ns1:field name="encrypted_user_password" databaseType="VARCHAR" datatype="java.lang.String" forSelect="false" insertExpression="sys_login_pkg.md5(${@confirm_password})"/>
+        <ns1:field name="password_encrypted" databaseType="VARCHAR" datatype="java.lang.String" forSelect="false" insertExpression="sys_login_pkg.md5(${@confirm_password})"/>
         <ns1:field name="start_date" databaseType="DATE" datatype="java.sql.Date" forInsert="true" forUpdate="true" prompt="HAP_START_DATE"/>
         <ns1:field name="end_date" databaseType="DATE" datatype="java.sql.Date" forInsert="true" forUpdate="true" prompt="HAP_END_DATE"/>
         <ns1:field name="last_logon_date" databaseType="DATE" datatype="java.sql.Date" forInsert="true" forUpdate="true"/>