Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-27 614b0106f079e67bb674a37ede2bd0fe3df2a430

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

@@ -54,7 +54,7 @@
                                </div>

                                <div class="row btn-group-m-t">
                                    <div class="col-sm-10 col-sm-offset-5">
                                <div class="col-sm-10">
                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
                                    </div>
                                </div>
@@ -66,11 +66,10 @@
        </div>
    </div>
</div>
<script src="${ctxPath}/modular/system/user/user_info.js"></script>
<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
<script>
    laydate.render({
        elem: '#birthday'
        ,lang:"en"
    });
</script>
@}