Merge remote-tracking branch 'origin/master'

liujie

2023-10-07 44311853fa68f04db11d341bd374a4ac9b5ea567

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

@@ -10,17 +10,17 @@
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <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>
                                <#SelectCon id="province" name="所在省" >
                                <option value="">全部</option>
                            </#SelectCon>
                        </div>
                        <div class="col-sm-3">
                                <#SelectCon id="city" name="所在市" >
                                <option value="">全部</option>
                            </#SelectCon>
                        </div>
                    <div class="col-sm-3">
                        <#SelectCon id="userPopulation" name="所属账号" >
                        <#SelectCon id="operator" name="所属运营商" >
                        <option value="">全部</option>
                    </#SelectCon>
                </div>