Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-27 614b0106f079e67bb674a37ede2bd0fe3df2a430

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

@@ -17,7 +17,7 @@
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <input hidden id="language" value="${language}">

                            <div class="col-sm-3">
                                @if(language==1){
                                <#TimeCon id="createTime" name="添加时间" />