From beef89c525654f04fe17936a2aeae59f1411a6a0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Jul 2021 11:41:13 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
index 2771b0f..e6cdcd0 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
@@ -6,6 +6,7 @@
         SELECT
                a.*,
                a.CREATED_TIME createTime,
+               ifnull(a.is_finish,2) isFinish,
                b.nick_name name,
                b.mobile_phone phone,
                d.express_com expressCom,

--
Gitblit v1.9.1