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

jyy

2021-06-09 ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c

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

@@ -71,7 +71,7 @@

        <div class="form-group">
            <label class="col-sm-2 control-label">充值卡备注</label>
            <div class="col-sm-10">
            <div class="col-sm-4">
                <textarea class="form-control" name="remark" rows="4" th:text="${obj?.remark}"></textarea>
                <div class="Validform_checktip"></div>
            </div>
@@ -80,7 +80,7 @@

        <div class="form-group">
            <label class="col-sm-2 control-label">本次修改说明<span class="text-danger">*</span></label>
            <div class="col-sm-10">
            <div class="col-sm-4">
                <input dataType="*1-200" errormsg="修改充值卡必须填写修改说明" class="form-control" name="changeRemark"/>
                <div class="Validform_checktip"></div>
            </div>