Merge remote-tracking branch 'origin/jenkins_with_weblogic' of C:/eactive/workspaces/eapim-bundle/bundles/251111/eapim-admin_incremental_2025-08-01.bundle into jenkins_with_weblogic

2025-11-11 09:58:43 +09:00
parent 1feb21ec02 597a90cd44
commit d61c538c35
18 changed files with 291 additions and 223 deletions
@@ -25,7 +25,7 @@
 			<maxHistory>10</maxHistory>
 		</rollingPolicy>
 		<encoder>
-			<charset>utf-8</charset>			
+			<charset>utf-8</charset>
 			<pattern>${LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
@@ -2728,6 +2728,7 @@ portalUser.mobile            = \uD734\uB300\uD3F0\uBC88\uD638
 portalUser.roleName          = \uAD8C\uD55C
 portalUser.emailAddr         =\uC774\uBA54\uC77C \uC544\uC774\uB514
 portalUser.approvalStatus    =\uC2B9\uC778\uC0C1\uD0DC
+portalUser.accountLockYn     =\uCC28\uB2E8\uC5EC\uBD80

 portalUserDetail.title       =\uAC00\uC785\uC790\uC815\uBCF4
 portalOrgDetail.title=\uBC95\uC778 \uC815\uBCF4