Merge branch 'score_shop' into api_score_meger

jyy

2021-07-17 274fceda8d8ae15eead0fc6490f4d1680d9ab3c5

 zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-form.html

@@ -220,6 +220,19 @@

                            <div class="form-group">

                                <label class="col-sm-2 control-label">所属门店<span
                                        class="text-danger">*</span></label>
                                <div class="col-sm-4">
                                    <select class="form-control autoFull" dataType="*"
                                            nullmsg="所属门店不能为空" th:data-url="@{/hiveErp/shopInfo/findShopByRole}"
                                            data-value="id" data-filed="shopName"
                                            th:data-def="${obj?.shopId}"
                                            name="shopId">
                                        <option value=''>--选择所属门店--</option>
                                    </select>
                                    <div class="Validform_checktip"></div>
                                </div>

                                <label class="col-sm-2 control-label">资金密码</label>
                                <div class="col-sm-4">
                                    <input autocomplete="off"   type="input" class="form-control" name="passWord"