From 0507f7602ce4f857cc87e53d27aa44177cbba702 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 5 Sep 2024 16:26:59 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7=E8=B5=84=E6=96=99=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E6=97=B6=E9=97=B4=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=EF=BC=9A?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E8=B5=84=E6=96=99=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E5=88=86=E9=A1=B5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
index ece1fb40..c6b20c28 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
@@ -119,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="customerPurser != null  and customerPurser != ''"> and s.customer_purser like concat('%', #{customerPurser}, '%')</if>
             <if test="customerAbbreviation != null  and customerAbbreviation != ''"> and s.customer_abbreviation like concat('%', #{customerAbbreviation}, '%')</if>
             <if test="deliveryAddress != null  and deliveryAddress != ''"> and s.delivery_address like concat('%', #{deliveryAddress}, '%')</if>
-            <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="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and s.create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
             <if test="customerSign != null  and customerSign != ''"> and s.customer_sign = #{customerSign}</if>
         </where>
         order by s.audit_status asc, s.create_time desc
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 e6fd24d9..0f29bfaf 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
@@ -545,9 +545,6 @@
                 },
                 {title: '录入时间',field: 'createTime',
                     sortable: true,
-                    formatter: function (value, row, index) {
-                        if (value == null) {return " ";} else { return value;}
-                    }
                 },
                 {title: '上次修改时间',field: 'updateTime',},
                 {title: '操作',align: 'center',