From 39b5aa730edf14c9215935a5fc836be8e8345e1c Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 26 Jan 2021 21:20:54 +0800
Subject: [PATCH] 划扣bug
---
zq-erp/src/main/resources/templates/views/super/sysCompany-form.html | 2 +-
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml | 10 +++++-----
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html | 1 +
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
index 01462d3..c10462e 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
@@ -246,20 +246,20 @@
CHANGE_ID = #{changeId},
</if>
<if test="oldShopId != null and oldShopId !='' ">
- OLD_SHOP_ID = #{oldShopId}
+ OLD_SHOP_ID = #{oldShopId},
</if>
<if test="consumeTime != null ">
- consume_time = #{consumeTime}
+ consume_time = #{consumeTime},
</if>
<if test="reply != null ">
- reply = #{reply}
+ reply = #{reply},
</if>
<if test="comment != null ">
- comment = #{comment}
+ comment = #{comment},
</if>
<if test="overtimeNotice != null ">
- overtime_notice = #{overtimeNotice}
+ overtime_notice = #{overtimeNotice},
</if>
</set>
WHERE id=#{id}
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html
index 785ca3a..7eeaf03 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html
@@ -111,6 +111,7 @@
<th data-field="money">消耗金额</th>
<th data-field="createTime" data-sortable="true" data-formatter="MGrid.getTime">下单时间</th>
<th data-field="yyTime" data-sortable="true" data-formatter="MGrid.getTime">预约时间</th>
+ <th data-field="consumeTime" data-sortable="true" data-formatter="MGrid.getTime">划扣时间</th>
<th data-field="totalTime" data-sortable="true">服务时长</th>
<th data-field="isOverTime" data-formatter="overTime">超时时间</th>
<th data-field="createStaffName">下单顾问</th>
diff --git a/zq-erp/src/main/resources/templates/views/super/sysCompany-form.html b/zq-erp/src/main/resources/templates/views/super/sysCompany-form.html
index 73347ad..0c82ad2 100644
--- a/zq-erp/src/main/resources/templates/views/super/sysCompany-form.html
+++ b/zq-erp/src/main/resources/templates/views/super/sysCompany-form.html
@@ -56,7 +56,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">联系电话</label>
<div class="col-sm-4">
- <input type="text" dataType="m" class="form-control"
+ <input type="text" dataType="*11-11" class="form-control"
name="comBossTel" ignore="ignore" th:value="${obj.comBossTel }"
nullmsg="联系电话不能为空">
<div class="Validform_checktip"></div>
--
Gitblit v1.9.1