Merge remote-tracking branch 'origin/master'

liujie

2023-10-24 40f362f8c120a94f35e28dcba6e70b5e42c6d599

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

@@ -45,6 +45,7 @@
            <input hidden id="role" value="${role}">
            <input hidden id="type" value="${item.type}">

            @if(role=='1'){
            <div class="form-group">
                <label class="col-sm-3 control-label">门店类型：</label>
                <div class="col-sm-9">
@@ -52,6 +53,7 @@
                    <input type="radio" name="type" value="2" onclick="updateType(2)"> 运营商门店
                </div>
            </div>
            @}
            @if(role=='1'){
            <div class="form-group" id="yys" hidden >
                <label class="col-sm-3 control-label">所属运营商：</label>