Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-14 26e2592813b9263124d518d238262910e817d323

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

@@ -10,15 +10,15 @@
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#SelectCon id="province" name="所在省" >
                                <option value="">全部</option>
                            </#SelectCon>
                        </div>
                        <div class="col-sm-3">
                            <#SelectCon id="city" name="所在市" >
                            <option value="">全部</option>
                        </#SelectCon>
                    </div>
                                <select class="form-control" id="province">
                                    <option value="">全部</option>
                                </select>
                            </div>
                            <div class="col-sm-3">
                                <select class="form-control" id="city">
                                    <option value="">全部</option>
                                </select>
                            </div>
                    <div class="col-sm-3">
                        <#SelectCon id="userPopulation" name="所属账号" >
                        <option value="">全部</option>
@@ -36,12 +36,12 @@
            </div>
            <#table id="TStoreProvinceTable"/>
            <div style="margin-left: 30%">
                <button type="button" class="btn btn-info button-margin" onclick="storeOfClosePage()"
                <button type="button" class="btn btn-info button-margin" onclick="TStoreProvince.storeOfClosePage()"
                        id="closePage" style="width: 30%;height: 40px;background: #0d8ddb;color: white;border: none;">
                    <i class="fa fa-check"></i>&nbsp;关闭
                </button>

                <button type="button" class="btn btn-info button-margin" onclick="saveSelectStores()"
                <button type="button" class="btn btn-info button-margin" onclick="TStoreProvince.saveSelectStores()"
                        id="submit" style="margin-left: 5%;width: 30%;height: 40px;background: #0d8ddb;color: white;border: none;">
                    <i class="fa fa-check"></i>&nbsp;保存
                </button>
@@ -54,4 +54,5 @@
</div>
</div>
<script src="${ctxPath}/modular/system/tCoupon/TStoreInfo.js"></script>
<script src="${ctxPath}/modular/system/tCoupon/TCouponInfo.js"></script>
@}