Merge remote-tracking branch 'origin/score_shop' into score_shop

935090232@qq.com

2021-10-06 1d394446abb8465e63fd1fd9a768796e149edbd6

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html

@@ -40,6 +40,14 @@
                <input autocomplete="off"   name="endTimeVo"  type="text" class="form-control datetimepicker" id="endTime">
            </div>

            <div class="form-group mr-20">
                <label >所属门店</label>
                <select class="form-control autoFull" data-filed="shopName" name="shopId" id="shopId"
                        th:data-url="@{/admin/shopInfo/findAll}">
                    <option value=''>--请选择部所属门店--</option>
                </select>
            </div>

            <input autocomplete="off"   type="hidden" name="statu" value="待付款" id="statu"/>
            <div class="form-group mr-20">
                <button type="button" class="btn btn-my btn-sm" id="btn0" value="" >全部</button>
@@ -89,6 +97,7 @@

                <th data-field="statu">订单状态</th>
                <th data-field="remark">备注</th>
                <th data-field="shopName">门店</th>

            </tr>
            </thead>