Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-30 2a498d9f65f873cedb74ab5bcb48ad4b845d0622

 management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice_edit.html

@@ -149,10 +149,10 @@
                                    <span class="control-label" >元</span>
                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                    @if(ChargeStandard.key == 0){
                                    <span class="fa fa-plus" onclick="TSystemConfig.addBox()"></span>
                                    <span class="fa fa-plus" onclick="TBranchOfficeInfoDlg.addBox()"></span>
                                    @}
                                    @if(ChargeStandard.key == 1){
                                    <span class="fa fa-remove" onclick="TSystemConfig.delBox(this)"></span>
                                    <span class="fa fa-remove" onclick="TBranchOfficeInfoDlg.delBox(this)"></span>
                                    @}
                                </div>
                                <div class="initialLevel col-sm-12 control-label form-group"  >