diff --git a/01-TestCase/tsg_ui/Administration/MyAccountCase.robot b/01-TestCase/tsg_ui/Administration/MyAccountCase.robot
new file mode 100644
index 0000000..7d01318
--- /dev/null
+++ b/01-TestCase/tsg_ui/Administration/MyAccountCase.robot
@@ -0,0 +1,80 @@
+*** Settings ***
+Force Tags        tsg-ui    My Account
+Resource          ../../../02-Keyword/tsg_ui/administration/Administration.robot
+Library           OperatingSystem
+*** Test Cases ***
+
+MyAccountEditClose
+    [Tags]    Positive    UI    Administration    My Account
+    OpenMyAccountPage
+    EditMyAccount    ${TEST NAME}    1111111    1111111    close
+    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    20
+    OpenMyAccountPage
+    EditMyAccount    ${username}    ${password}    ${password}    close
+    
+MyAccountEditOpen
+    [Tags]    Positive    UI    Administration    My Account
+    OpenMyAccountPage
+    EditMyAccount    ${TEST NAME}    1111111    1111111    Open
+    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    20
+    OpenMyAccountPage
+    EditMyAccount    ${username}    ${password}    ${password}    close
+
+MyAccountEditNameMinSize
+    [Tags]    Boundary    UI    Administration    My Account
+    OpenMyAccountPage
+    EditMyAccount    1    1111111    1111111    close
+    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    20
+    OpenMyAccountPage
+    EditMyAccount    ${username}    ${password}    ${password}    close
+    
+MyAccountEditNameMaxSize
+    [Tags]    Boundary    UI    Administration    My Account
+    OpenMyAccountPage
+    EditMyAccount    MyAccountEditNameMaxSizeMyAccoun    1111111    1111111    close
+    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    20
+    OpenMyAccountPage
+    EditMyAccount    ${username}    ${password}    ${password}    close
+    
+MyAccountEditNameSpecialChar
+    [Tags]    Boundary    UI    Administration    My Account
+    OpenMyAccountPage
+    EditMyAccount    中文+absc+моряков+@#￥%……&*    1111111    1111111    close
+    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    20
+    OpenMyAccountPage
+    EditMyAccount    ${username}    ${password}    ${password}    close
+    
+MyAccountEditDayMinimum
+    [Tags]    Boundary    UI    Administration    My Account
+    OpenMyAccountPage
+    EditMyAccount    ${username}    1111111    1111111    open    1
+    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    20
+    OpenMyAccountPage
+    EditMyAccount    ${username}    ${password}    ${password}    close
+    
+MyAccountEditDayMinimum
+    [Tags]    Boundary    UI    Administration    My Account
+    OpenMyAccountPage
+    EditMyAccount    ${username}    1111111    1111111    open    2147483647
+    Wait Until Element Is Enabled    xpath=/html/body/div[last()]/p    20
+    OpenMyAccountPage
+    EditMyAccount    ${username}    ${password}    ${password}    close
+    
+MyAccountEditDayExceedMax
+    [Tags]    Negtive    UI    Administration    My Account
+    OpenMyAccountPage
+    EditMyAccount    ${username}    1111111    1111111    open    2147483648
+    Assertion    //*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[6]/div/div[2]    Cannot be 0, exceed maximum 2147483647, and be empty
+    
+MyAccountPasswordNotModified
+    [Tags]    Negtive    UI    Administration    My Account
+    OpenMyAccountPage
+    EditMyAccount    ${username}    ${password}    ${password}
+    Assertion    /html/body/div[last()]/p    The password setting cannot be the same as the previous one.
+    
+MyAccountTwoPasswordsAreInconsistent
+    [Tags]    Negtive    UI    Administration    My Account
+    OpenMyAccountPage
+    EditMyAccount    ${username}    111    111111111
+    Assertion    //*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[4]/div/div[2]    The two passwords are inconsistent   
+
diff --git a/02-Keyword/tsg_ui/administration/Administration.robot b/02-Keyword/tsg_ui/administration/Administration.robot
index c1ca889..6ea0b96 100644
--- a/02-Keyword/tsg_ui/administration/Administration.robot
+++ b/02-Keyword/tsg_ui/administration/Administration.robot
@@ -424,7 +424,38 @@ EditLockTime
     input text    xpath=//*[@id="policy_Manipulation2"]/div/div[2]/div/div/form/div[4]/div/div[1]/input    ${Time}
     sleep    1
     click element    id=wanAdd_ok
-    sleep    2      
+    sleep    2
+    
+OpenMyAccountPage
+    [Documentation]    打开MyAccount侧滑框
+    sleep    1
+    Mouse Hover    xpath=//*[@id="app"]/div/div[1]/div[2]/div/span/div/span
+    sleep    1
+    click element    id=editInfo
+    sleep    2  
+    
+EditMyAccount
+    [Arguments]    ${name}    ${password}    ${ConfirmPassword}    ${RequiredPasswordChange}=null    ${Day}=null
+    [Documentation]
+    ...    
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[1]/div/div[1]/input    ${name}
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[3]/div/div/input    ${password}
+    sleep    1
+    input text    xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[4]/div/div/input    ${ConfirmPassword}
+    sleep    1
+    ${status}    Get Element Attribute    xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[5]/div/div    class
+    run keyword if    "${RequiredPasswordChange}"=="open" and "${status}"=="el-switch"    run keywords    sleep    1
+    ...    AND    click element    xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[5]/div/div/span
+    ...    AND    sleep    1
+    ...    AND    input text    xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[6]/div/div/input    ${Day}
+    run keyword if    "${RequiredPasswordChange}"=="close" and "${status}"=="el-switch is-checked"    run keywords    sleep    1
+    ...    AND    click element    xpath=//*[@id="app"]/div/div[3]/div[1]/div/div/div[1]/div/div/div[1]/div/div/div[1]/div[2]/form/div[5]/div/div/span
+    ...    ELSE    log    不修改密码提醒按钮
+    sleep    1
+    click element    id=userOk
+    sleep    1
     
 
 LoginRestrictionsObtainSQLIP