From 2b295828fa6be1909565f84cc2a9c387d9aa69c7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Jun 2021 14:41:24 +0800
Subject: [PATCH] 20210628 集物员审核
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 4 ++--
gc-shop/src/main/resources/sql | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index 10bf81e..a0f17dc 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -33,11 +33,11 @@
or b.mobile_phone like concat('%',#{record.accountPhone},'%') )
</if>
<if test="record.reserveTimeStart != null">
- and a.reserve_time >= #{record.reserveTimeStart}
+ and a.reserve_date >= #{record.reserveTimeStart}
</if>
<if test="record.reserveTimeEnd != null">
- and a.reserve_time <= #{record.reserveTimeEnd}
+ and a.reserve_date <= #{record.reserveTimeEnd}
</if>
order by a.CREATED_TIME desc
</select>
diff --git a/gc-shop/src/main/resources/sql b/gc-shop/src/main/resources/sql
index 9057995..903a99a 100644
--- a/gc-shop/src/main/resources/sql
+++ b/gc-shop/src/main/resources/sql
@@ -53,6 +53,14 @@
ALTER TABLE `xzx_score_order`
ADD COLUMN `voucher_img` varchar(500) NULL COMMENT '凭证' AFTER `remark`;
+ALTER TABLE `xzx_user_info`
+MODIFY COLUMN `mobile_phone` varchar(20) CHARACTER SET utf8mb4 NOT NULL COMMENT '手机号码' AFTER `user_id`;
+
+ALTER TABLE `xzx_user_info`
+MODIFY COLUMN `nick_name` varchar(100) CHARACTER SET utf8mb4 NULL DEFAULT NULL AFTER `name`;
+
+
+
--
Gitblit v1.9.1