~jiangyouyao/beauty-erp.git

			@@ -240,10 +240,10 @@
			and a.orderType = #{record.orderType}
			</if>
			<if test="record.beginTimeVo != null ">
			and a.ORDER_TIME >= #{record.beginTimeVo}
			and a.pay_time >= #{record.beginTimeVo}
			</if>
			<if test="record.endTimeVo != null ">
			<![CDATA[and a.ORDER_TIME <= #{record.endTimeVo}]]>
			<![CDATA[and a.pay_time <= #{record.endTimeVo}]]>
			</if>

			</if>
			@@ -321,10 +321,10 @@
			and a.SHOP_ID = #{record.shopId}
			</if>
			<if test="record.beginTimeVo != null ">
			and a.ORDER_TIME >= #{record.beginTimeVo}
			and a.pay_time >= #{record.beginTimeVo}
			</if>
			<if test="record.endTimeVo != null ">
			<![CDATA[and a.ORDER_TIME <= #{record.endTimeVo}]]>
			<![CDATA[and a.pay_time <= #{record.endTimeVo}]]>
			</if>
			</if>
			</select>

			@@ -52,7 +52,7 @@
			</select>
			</div>
			<div class="form-group mr-20">
			<label>订单日期</label>
			<label>付款日期</label>
			<input autocomplete="off" name="beginTimeVo" type="text" class="form-control datetimepicker" id="beginTime">-
			<input autocomplete="off" name="endTimeVo" type="text" class="form-control datetimepicker" id="endTime">
			</div>
			@@ -100,6 +100,8 @@
			<th data-field="vipPhone">客户手机号</th>
			<th data-field="orderTime" data-formatter="MGrid.getTime"
			data-sortable="true">下单时间</th>
			<th data-field="payTime" data-formatter="MGrid.getTime"
			data-sortable="true">支付时间</th>
			<th data-field="statu">订单状态</th>
			<th data-field="total">订单总价</th>
			<th data-field="zkTotal">折后价</th>

	zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml	8 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html	4 ●●●●● patch \| view \| raw \| blame \| history