Merge branch 'score_shop' into api_score_meger

jyy

2021-07-14 a2d8b47677fcf9eff87faff1bb89a8674714ddd7

 zq-erp/src/main/resources/templates/views/admin/hive/store/projService-list.html

@@ -31,10 +31,7 @@
                <label>客户姓名</label>
                <input autocomplete="off"   name="vipName" id="vipName" type="text" class="form-control" >
            </div>
            <div class="form-group mr-20">
                <label >超时时长 > </label>
                <input autocomplete="off"   name="isOverTime" type="text" class="form-control" placeholder="单位分钟"  id="isOverTime">
            </div>

            <div class="form-group mr-20">
                <label >所属门店</label>
                <select class="form-control autoFull" data-filed="shopName" name="shopId" id="shopId"