From ebca548b84573439f86efdf22d46900f5c16c84e Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Tue, 11 Jun 2024 10:49:25 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=9A=E5=AE=A2=E6=88=B7=E8=B5=84=E6=96=99=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=8C=89=E7=85=A7first=5Fadd=5Ftime=E5=8D=87?=
 =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/system/SysCustomerMapper.xml    | 1 +
 .../main/resources/templates/system/customer/customer.html    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
index 504424c1..766c18b8 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
@@ -114,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and s.first_add_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
              <if test="customerSign != null  and customerSign != ''"> and s.customer_sign = #{customerSign}</if>
         </where>
+        order by s.first_add_time desc
     </select>
 
     <select id="selectSysCustomerWithComplaintNotice" resultMap="SysCustomerResult">
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
index f9b6d17d..25fa6614 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
@@ -501,12 +501,12 @@
                 {title: '第一收货人邮编',field: 'deliveryCustomerPostal',visible:false},
                 {title: '第一收货人传真',field: 'deliveryCustomerFax',visible: false},
                 {title: '客户标识',field:'customerSign'},
-                {title: '录入时间',field: 'createTime',
+                {title: '录入时间',field: 'firstAddTime',
                     formatter: function (value, row, index) {
                         if (value == null) {return " ";} else { return value;}
                     }
                 },
-                {title: '上次修改时间',field: 'updateTime',},
+                {title: '上次修改时间',field: 'updateInfoTime',},
                 {title: '操作',align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];