From b1a04377a1c5182c67287c94385ad0c147c3ae95 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Thu, 10 Dec 2020 19:49:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stdiet/web/controller/custom/SysWxUserLogController.java | 1 -
 .../src/main/resources/mapper/custom/SysWxUserInfoMapper.xml | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserLogController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserLogController.java
index 49c70453c..959ae2e85 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserLogController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserLogController.java
@@ -108,7 +108,6 @@ public class SysWxUserLogController extends BaseController {
 
     @GetMapping(value = "/wx/logs/list")
     public AjaxResult getLogs(SysWxUserLog sysWxUserLog) {
-        System.out.println(sysWxUserLog.toString());
         List<WxLogInfo> list = sysWxUserLogService.selectWxLogInfoList(sysWxUserLog);
         return AjaxResult.success(list);
     }
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml
index 36c1fd1d3..49665dcea 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml
@@ -36,11 +36,14 @@
     </select>
 
     <select id="selectSysWxUserInfoListNot" parameterType="SysWxUserInfo" resultMap="SysWxUserInfoResult">
-        select openid, nick_name, appid, phone, avatar_url, sex from sys_wx_user_info right join sys_order using(phone)
+        select user.openid, user.nick_name, user.appid, user.phone, user.avatar_url, user.sex, user.update_time from sys_wx_user_info user
+        right join sys_order
+        on user.phone = sys_order.phone
         <where>
             <if test="appid != null  and appid != ''">and appid = #{appid}</if>
             <if test="openid != null  and openid != ''">and openid != #{openid}</if>
         </where>
+        order by update_time desc
     </select>
 
     <select id="selectSysWxUserInfoById" parameterType="String" resultMap="SysWxUserInfoResult">

From b18a3774acccd5e1e9e7c46cc8ef386f2d596c59 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Fri, 11 Dec 2020 17:47:14 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=A1?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stdiet-ui/src/views/custom/wxUserLog/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stdiet-ui/src/views/custom/wxUserLog/index.vue b/stdiet-ui/src/views/custom/wxUserLog/index.vue
index b4c3fb793..0f02d7d74 100644
--- a/stdiet-ui/src/views/custom/wxUserLog/index.vue
+++ b/stdiet-ui/src/views/custom/wxUserLog/index.vue
@@ -82,7 +82,7 @@
       <!--      <el-table-column label="微信openid" align="center" prop="openid" />-->
       <el-table-column label="当天体重" align="center" prop="weight">
         <template slot-scope="scope">
-          <span>{{`${scope.row.weight} kg` }}</span>
+          <span>{{`${scope.row.weight} 斤` }}</span>
         </template>
       </el-table-column>
       <el-table-column label="微信应用" align="center" prop="appid" :formatter="appidFormat"/>

From 4494341d085fe949fe9b73cba170d33a2ff2eed7 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Fri, 11 Dec 2020 17:49:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=A1?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stdiet-ui/src/views/custom/wxUserLog/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stdiet-ui/src/views/custom/wxUserLog/index.vue b/stdiet-ui/src/views/custom/wxUserLog/index.vue
index 0f02d7d74..3e57e024e 100644
--- a/stdiet-ui/src/views/custom/wxUserLog/index.vue
+++ b/stdiet-ui/src/views/custom/wxUserLog/index.vue
@@ -86,7 +86,7 @@
         </template>
       </el-table-column>
       <el-table-column label="微信应用" align="center" prop="appid" :formatter="appidFormat"/>
-      <el-table-column label="手机号" align="center" prop="phone"/>
+      <el-table-column label="手机号" align="center" prop="phone" width="180"/>
       <el-table-column label="打卡日期" align="center" prop="logTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.logTime, '{y}-{m}-{d}') }}</span>