Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-16 4e8951a439c03e87568789cedeb62033884412db

 management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserStartAndStopException.html

@@ -7,18 +7,20 @@
                    <div class="col-sm-12">
                        <input hidden id="id" value="${id}">
                        <input hidden id="status" value="${status}">
                        <div class="col-lg-3">
                        <div>
                            @if(status==1){
                                冻结理由:<textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 681px; height: 249px;"></textarea>
                            <label>冻结理由:</label><br/><br/>
                                <textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 100%; height: 180px;" required></textarea>
                            @}
                            @if(status==2){
                                启用理由:<textarea id="startRemark" placeholder="请输入启用理由" maxlength="200" style="width: 681px; height: 249px;"></textarea>
                            <label>启用理由:</label><br/><br/>
                                <textarea id="startRemark" placeholder="请输入启用理由" maxlength="200" style="width: 100%; height: 180px;" required></textarea>
                            @}
                        </div>
                        <div class="hidden-xs" id="TAppUserTableToolbar" role="group"  style="margin-left:300px">
                            <#button name="取消" icon="fa-plus" clickFun="TAppUserInfoDlg.closeException()" />
                            <#button name="确定" icon="fa-plus" clickFun="TAppUserException.updateStatus()"/>
                        </div>
                    </div>
                    <div class="hidden-xs" id="TAppUserTableToolbar" role="group"  style="text-align: center">
                        <#button name="取消" icon="fa-plus" clickFun="TAppUserInfoDlg.closeException()" />
                        <#button name="确定" icon="fa-plus" clickFun="TAppUserException.updateStatus()"/>
                    </div>
                </div>
            </div>