Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-28 52cfd50f3a812bf1c0a4c3ef2f1e65fcf8579adb

 cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html

@@ -6,15 +6,7 @@
            <input hidden id="id" value="${id}">
            <div class="ibox-title">

                @if(language==1){
                <h5>管理</h5>
                @}
                @if(language==2){
                <h5>Administration</h5>
                @}
                @if(language==3){
                <h5>Administrasi</h5>
                @}
            </div>
            <div class="ibox-content">
                <div class="row row-lg">