beauty-erp.git - Gitblit

			@@ -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}

			@@ -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>

			@@ -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>

	zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml	10 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html	1 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/super/sysCompany-form.html	2 ●●●●● patch \| view \| raw \| blame \| history