From 509d10498313921fd795f73b8e7ae9ee43b0a81a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Apr 2021 14:24:29 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/templates/views/admin/hive/vip/tc-form.html | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/vip/tc-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/vip/tc-form.html
index 182a537..e1c84b4 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/vip/tc-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/vip/tc-form.html
@@ -50,7 +50,7 @@
</div>
<div class="form-group">
- <div class="col-sm-8 col-md-offset-2" id="projBox">
+ <div class="col-sm-4 col-md-offset-2" id="projBox">
<table class="table table-striped table-hover table-bordered"
id="mgrid">
<thead>
@@ -90,9 +90,16 @@
</div>
<div class="form-group">
- <label class="col-sm-2 control-label">备注</label>
- <div class="col-sm-10">
- <textarea class="form-control" name="remark" rows="4" >[[${obj.remark}]]</textarea>
+ <label class="col-sm-2 control-label">套餐备注</label>
+ <div class="col-sm-4">
+ <textarea class="form-control" name="remark" rows="4" th:text="${obj?.remark}" ></textarea>
+ <div class="Validform_checktip"></div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">修改备注<span class="text-danger">*</span></label>
+ <div class="col-sm-4">
+ <textarea datatype="*1-200" class="form-control" name="updateRemark" rows="4" ></textarea>
<div class="Validform_checktip"></div>
</div>
</div>
--
Gitblit v1.9.1