Merge branch 'susu' into dev
This commit is contained in:
@@ -12,22 +12,18 @@
|
||||
INSERT INTO admin (seq,
|
||||
id,
|
||||
password,
|
||||
email,
|
||||
region_main_code,
|
||||
password_updated_at,
|
||||
account_disabled,
|
||||
login_fail_cnt,
|
||||
account_locked,
|
||||
<include refid="common.fields.CreateUpdateBaseColumns"/>)
|
||||
VALUES (#{seq},
|
||||
#{id},
|
||||
#{encodedPassword},
|
||||
#{email},
|
||||
#{regionMainCode},
|
||||
#{passwordUpdatedAt},
|
||||
#{accountDisabled},
|
||||
#{loginFailCnt},
|
||||
#{accountLocked},
|
||||
<include refid="common.fields.CreateUpdateBaseValues"/>)
|
||||
</insert>
|
||||
|
||||
@@ -36,12 +32,10 @@
|
||||
UPDATE admin
|
||||
SET
|
||||
password = #{encodedPassword},
|
||||
email = #{email},
|
||||
region_main_code = #{regionMainCode},
|
||||
password_updated_at = #{passwordUpdatedAt},
|
||||
account_disabled = #{accountDisabled},
|
||||
login_fail_cnt = #{loginFailCnt},
|
||||
account_locked = #{accountLocked},
|
||||
<include refid="common.fields.UpdateBaseSet"/>
|
||||
WHERE seq = #{seq}
|
||||
</update>
|
||||
|
||||
Reference in New Issue
Block a user