Merge remote-tracking branch 'origin/dev' into dev

pom.xml

@@ -318,4 +318,21 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

sckw-auth/src/main/java/com/sckw/auth/model/vo/req/EntAuthenticationReqVo.java

@@ -45,7 +45,7 @@ public class EntAuthenticationReqVo implements Serializable {
     /**
      * 联系电话
      */
-    private String telephone;
+    private String phone;
 
     /**
      * 法人姓名
@@ -55,7 +55,7 @@ public class EntAuthenticationReqVo implements Serializable {
     /**
      * 法人电话
      */
-    private String legalTelephone;
+    private String legalPhone;
 
     /**
      * 企业头像

sckw-auth/src/main/java/com/sckw/auth/model/vo/req/RegisterReqVo.java

@@ -34,7 +34,7 @@ public class RegisterReqVo implements Serializable {
      * 手机号
      */
     @NotBlank(message = "联系电话不能为空")
-    private String telephone;
+    private String phone;
 
     /**
      * 系统类型(1运营端、2企业开户)

sckw-auth/src/main/java/com/sckw/auth/model/vo/res/EntInfoResVo.java

@@ -36,7 +36,7 @@ public class EntInfoResVo {
     /**
      * 联系电话
      */
-    private String telephone;
+    private String phone;
 
     /**
      * 法人姓名
@@ -46,7 +46,7 @@ public class EntInfoResVo {
     /**
      * 法人联系电话
      */
-    private String legalTelephone;
+    private String legalPhone;
 
     /**
      * 企业头像

sckw-auth/src/main/java/com/sckw/auth/model/vo/res/LoginResVo.java

@@ -47,7 +47,7 @@ public class LoginResVo implements Serializable {
     /**
      * 电话
      */
-    private String telephone;
+    private String phone;
 
     /**
      * 头像

sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -134,7 +134,7 @@ public class AuthServiceImpl implements IAuthService {
     @Transactional(rollbackFor = {})
     public void register(RegisterReqVo reqVo) {
         /*1、校验验证码*/
-        String key = Global.USER_LOGIN_CAPTCHA + reqVo.getTelephone() + Global.COLON + reqVo.getSystemType();
+        String key = Global.USER_LOGIN_CAPTCHA + reqVo.getPhone() + Global.COLON + reqVo.getSystemType();
         String sms = RedissonUtils.getString(key);
         if (!reqVo.getCaptcha().equals(sms)) {
             throw new SystemException(HttpStatus.CODE_10301, HttpStatus.CAPTCHA_ERROR);

sckw-common/sckw-common-core/src/main/java/com/sckw/core/exception/GlobalSystemExceptionHandler.java

@@ -3,6 +3,7 @@ package com.sckw.core.exception;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -12,6 +13,7 @@ import java.util.Objects;
 
 @Slf4j
 @RestControllerAdvice
+@Configuration
 public class GlobalSystemExceptionHandler {
 
     @ExceptionHandler(value = SystemException.class)

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/auth/LoginUserInfo.java

@@ -28,7 +28,7 @@ public class LoginUserInfo {
     /**
      * 用户电话
      */
-    private String telephone;
+    private String phone;
     /**
      *是否主账号（0是/1否）
      */
@@ -58,13 +58,13 @@ public class LoginUserInfo {
     public LoginUserInfo() {
     }
 
-    public LoginUserInfo(Long id, Integer systemType, String account, String userName, String telephone,
+    public LoginUserInfo(Long id, Integer systemType, String account, String userName, String phone,
                          int isMain, int status, Long entId, String clientType, Long deptId) {
         this.id = id;
         this.systemType = systemType;
         this.account = account;
         this.userName = userName;
-        this.telephone = telephone;
+        this.phone = phone;
         this.isMain = isMain;
         this.status = status;
         this.entId = entId;

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/auth/context/LoginUserHolder.java

@@ -79,8 +79,8 @@ public class LoginUserHolder {
      * @author zhaokang
      * @Date 2020/04/13 0021
      */
-    public static String getTelephone(){
-        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getTelephone();
+    public static String getPhone(){
+        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getPhone();
     }
 
     /**

sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/context/LoginUserHolder.java

@@ -79,8 +79,8 @@ public class LoginUserHolder {
      * @author zhaokang
      * @Date 2020/04/13 0021
      */
-    public static String getTelephone(){
-        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getTelephone();
+    public static String getPhone(){
+        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getPhone();
     }
 
     /**

sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/model/LoginUserInfo.java

@@ -28,7 +28,7 @@ public class LoginUserInfo {
     /**
      * 用户电话
      */
-    private String telephone;
+    private String phone;
     /**
      *是否主账号（0是/1否）
      */
@@ -54,13 +54,13 @@ public class LoginUserInfo {
     public LoginUserInfo() {
     }
 
-    public LoginUserInfo(Long id, Integer systemType, String account, String userName, String telephone,
+    public LoginUserInfo(Long id, Integer systemType, String account, String userName, String phone,
                          int isMain, int status, Long entId, String clientType, String deptIds) {
         this.id = id;
         this.systemType = systemType;
         this.account = account;
         this.userName = userName;
-        this.telephone = telephone;
+        this.phone = phone;
         this.isMain = isMain;
         this.status = status;
         this.entId = entId;

sckw-common/sckw-common-stream/src/main/java/com/sckw/stream/model/SckwSms.java

@@ -29,7 +29,7 @@ public class SckwSms {
     /**
      * 手机号
      */
-    private String telephone;
+    private String phone;
 
     /**
      * 手机号集合(腾讯短信)

sckw-common/sckw-common-stream/src/main/java/com/sckw/stream/utils/SmsUtil.java

@@ -55,13 +55,13 @@ public class SmsUtil {
 
     public static void main(String[] args) {
         SckwSms sckwSms = new SckwSms();
-        sckwSms.setTelephone("17358629955");
+        sckwSms.setPhone("17358629955");
         sckwSms.setSignName("矿拉拉");
         sckwSms.setTemplateCode(SmsCodeEnum.VERIFICATION_CODE);
         sckwSms.setParams(new HashMap(){{put("code", "123456");}});
         try {
             //发送短信 {"code":"123456"}
-            SmsUtil.sendSms(sckwSms.getTelephone(), sckwSms.getSignName(), sckwSms.getTemplateCode().getName(), JSON.toJSONString(sckwSms.getParams()));
+            SmsUtil.sendSms(sckwSms.getPhone(), sckwSms.getSignName(), sckwSms.getTemplateCode().getName(), JSON.toJSONString(sckwSms.getParams()));
             System.out.println("短信发送成功");
         } catch (Exception e) {
             e.printStackTrace();

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/SysUser.java

@@ -35,7 +35,7 @@ public class SysUser implements Serializable {
 	/**
 	 * 手机号
 	 */
-	private String telephone;
+	private String phone;
 
 	/**
 	 * 头像

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/req/EntAuthenticationReqDto.java

@@ -45,7 +45,7 @@ public class EntAuthenticationReqDto implements Serializable {
     /**
      * 联系电话
      */
-    private String telephone;
+    private String phone;
 
     /**
      * 法人姓名
@@ -55,7 +55,7 @@ public class EntAuthenticationReqDto implements Serializable {
     /**
      * 法人电话
      */
-    private String legalTelephone;
+    private String legalPhone;
 
     /**
      * 企业头像

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/req/RegisterReqDto.java

@@ -29,7 +29,7 @@ public class RegisterReqDto implements Serializable {
     /**
      * 手机号
      */
-    private String telephone;
+    private String phone;
 
     /**
      * 是否是企业管理（1是 0否）

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/res/KwsEnterpriseResDto.java

@@ -70,7 +70,7 @@ public class KwsEnterpriseResDto implements Serializable {
     /**
      * 联系电话
      */
-    private String telephone;
+    private String phone;
 
     /**
      * 法人姓名
@@ -80,7 +80,7 @@ public class KwsEnterpriseResDto implements Serializable {
     /**
      * 法人联系电话
      */
-    private String legalTelephone;
+    private String legalPhone;
 
     /**
      * 企业头像

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/res/KwsUserResDto.java

@@ -35,7 +35,7 @@ public class KwsUserResDto implements Serializable {
     /**
      * 手机号
      */
-    private String telephone;
+    private String phone;
 
     /**
      * 头像

sckw-modules/sckw-example/src/main/java/com/sckw/example/controller/ExcelExportController.java

@@ -143,7 +143,7 @@ public class ExcelExportController {
             dos.setAccount("张三");
             dos.setPassword("password");
             dos.setName("张三");
-            dos.setTelephone("4564789113");
+            dos.setPhone("4564789113");
             dos.setPhoto("44546545");
             dos.setEmail("45456454");
             dos.setClientId("7879814");

sckw-modules/sckw-example/src/main/java/com/sckw/example/controller/SysUserController.java

@@ -145,7 +145,7 @@
 //    public HttpResult pushMesg() {
 //        String uuid = UUID.fastUUID().toString();
 //        SckwSms sckwSms = new SckwSms();
-//        sckwSms.setTelephone("17358629955");
+//        sckwSms.setPhone("17358629955");
 //        sckwSms.setSignName("矿拉拉");
 //        sckwSms.setTemplateCode(SmsCodeEnum.VERIFICATION_CODE);
 //        sckwSms.setParams(new HashMap(){{put("code", "123456");}});

sckw-modules/sckw-example/src/main/java/com/sckw/example/model/KwsDept.java

@@ -17,7 +17,7 @@ public class KwsDept  extends BaseModel {
     private String password;
     private String account;
     private String systemType;
-    private String telephone;
+    private String phone;
     private String email;
     private String clientId;
     private String photo;

sckw-modules/sckw-example/src/main/java/com/sckw/example/model/SysUser.java

@@ -17,7 +17,7 @@ public class SysUser implements Serializable {
 
     private String name;
 
-    private String telephone;
+    private String phone;
 
     private String photo;
 }

sckw-modules/sckw-example/src/main/java/com/sckw/example/model/vo/SysEnterpriseVo.java

@@ -37,7 +37,7 @@ public class SysEnterpriseVo {
     @ExcelProperty(value = "企业名称")
     private String enterpriseName;
     @ExcelProperty(value = "企业手机号")
-    private String enterpriseTelephone;
+    private String enterprisePhone;
 
 
 }

sckw-modules/sckw-example/src/main/java/com/sckw/example/model/vo/SysUserVo.java

@@ -27,7 +27,7 @@ public class SysUserVo {
     @ExcelProperty(value = "姓名")
     private String name;
     @ExcelProperty(value = "手机号")
-    private String telephone;
+    private String phone;
     @ExcelProperty(value = "照片")
     private String photo;
 

sckw-modules/sckw-example/src/main/java/com/sckw/example/service/ExcelExportService.java

@@ -29,13 +29,13 @@ public class ExcelExportService {
         sysUserVo.setSystemType(1);
         sysUserVo.setAccount("张三");
         sysUserVo.setPassword("zhangsan");
-        sysUserVo.setTelephone("zhangsantel");
+        sysUserVo.setPhone("zhangsantel");
         SysUserVo sysUserVo1 = new SysUserVo();
         sysUserVo1.setId("2");
         sysUserVo1.setSystemType(2);
         sysUserVo1.setAccount("李四");
         sysUserVo1.setPassword("lisi");
-        sysUserVo1.setTelephone("lisitel");
+        sysUserVo1.setPhone("lisitel");
         List<SysUserVo> list = new ArrayList<>();
         list.add(sysUserVo1);
         list.add(sysUserVo);
@@ -102,25 +102,25 @@ public class ExcelExportService {
         sysUserVo.setSystemType(1);
         sysUserVo.setAccount("张三");
         sysUserVo.setPassword("zhangsan");
-        sysUserVo.setTelephone("zhangsantel");
+        sysUserVo.setPhone("zhangsantel");
         SysUserVo sysUserVo1 = new SysUserVo();
         sysUserVo1.setId("2");
         sysUserVo1.setSystemType(2);
         sysUserVo1.setAccount("李四");
         sysUserVo1.setPassword("lisi");
-        sysUserVo1.setTelephone("lisitel");
+        sysUserVo1.setPhone("lisitel");
         SysUserVo sysUserVo2 = new SysUserVo();
         sysUserVo2.setId("3");
         sysUserVo2.setSystemType(3);
         sysUserVo2.setAccount("王五");
         sysUserVo2.setPassword("wangwu");
-        sysUserVo2.setTelephone("wangwutel");
+        sysUserVo2.setPhone("wangwutel");
         SysUserVo sysUserVo3 = new SysUserVo();
         sysUserVo3.setId("4");
         sysUserVo3.setSystemType(4);
         sysUserVo3.setAccount("陈六");
         sysUserVo3.setPassword("chenliu");
-        sysUserVo3.setTelephone("chenliutel");
+        sysUserVo3.setPhone("chenliutel");
         List<SysUserVo> list = new ArrayList<>();
         list.add(sysUserVo);
         list.add(sysUserVo1);
@@ -135,13 +135,13 @@ public class ExcelExportService {
         sysUserVo.setSystemType(1);
         sysUserVo.setAccount("张三");
         sysUserVo.setPassword("zhangsan");
-        sysUserVo.setTelephone("zhangsantel");
+        sysUserVo.setPhone("zhangsantel");
         SysUserVo sysUserVo1 = new SysUserVo();
         sysUserVo1.setId("2");
         sysUserVo1.setSystemType(2);
         sysUserVo1.setAccount("李四");
         sysUserVo1.setPassword("lisi");
-        sysUserVo1.setTelephone("lisitel");
+        sysUserVo1.setPhone("lisitel");
         List<SysUserVo> list = new ArrayList<>();
         list.add(sysUserVo1);
         list.add(sysUserVo);

sckw-modules/sckw-example/src/main/resources/mapper/KwsDeptDao.xml

@@ -7,7 +7,7 @@
         <result column="account" jdbcType="VARCHAR" property="account" />
         <result column="password" jdbcType="VARCHAR" property="password" />
         <result column="name" jdbcType="VARCHAR" property="name" />
-        <result column="telephone" jdbcType="VARCHAR" property="telephone" />
+        <result column="phone" jdbcType="VARCHAR" property="phone" />
         <result column="photo" jdbcType="VARCHAR" property="photo" />
         <result column="email" jdbcType="VARCHAR" property="email" />
         <result column="client_id" jdbcType="VARCHAR" property="clientId" />
@@ -22,7 +22,7 @@
     </resultMap>
     <sql id="Base_Column_List">
          id as kws_user_id,  system_type as kws_user_system_type,  account as kws_user_account,
-     `password` as `kws_user_password`,  `name` as `kws_user_name`,  telephone as kws_user_telephone,
+     `password` as `kws_user_password`,  `name` as `kws_user_name`,  phone as kws_user_phone,
      photo as kws_user_photo,  email as kws_user_email,  client_id as kws_user_client_id,
      is_main as kws_user_is_main,  remark as kws_user_remark,  `status` as `kws_user_status`,
      create_by as kws_user_create_by,  create_time as kws_user_create_time,
@@ -41,13 +41,13 @@
     </delete>
     <insert id="insert" parameterType="com.sckw.example.dao.KwsDeptDao">
         insert into kws_user (id, system_type, account,
-                              `password`, `name`, telephone,
+                              `password`, `name`, phone,
                               photo, email, client_id,
                               is_main, remark, `status`,
                               create_by, create_time, update_by,
                               update_time, del_flag)
         values (#{id,jdbcType=BIGINT}, #{systemType,jdbcType=INTEGER}, #{account,jdbcType=VARCHAR},
-                #{password,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{telephone,jdbcType=VARCHAR},
+                #{password,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR},
                 #{photo,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{clientId,jdbcType=VARCHAR},
                 #{isMain,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
                 #{createBy,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=BIGINT},
@@ -71,8 +71,8 @@
             <if test="name != null">
                 `name`,
             </if>
-            <if test="telephone != null">
-                telephone,
+            <if test="phone != null">
+                phone,
             </if>
             <if test="photo != null">
                 photo,
@@ -124,8 +124,8 @@
             <if test="name != null">
                 #{name,jdbcType=VARCHAR},
             </if>
-            <if test="telephone != null">
-                #{telephone,jdbcType=VARCHAR},
+            <if test="phone != null">
+                #{phone,jdbcType=VARCHAR},
             </if>
             <if test="photo != null">
                 #{photo,jdbcType=VARCHAR},
@@ -177,8 +177,8 @@
             <if test="name != null">
                 `name` = #{name,jdbcType=VARCHAR},
             </if>
-            <if test="telephone != null">
-                telephone = #{telephone,jdbcType=VARCHAR},
+            <if test="phone != null">
+                phone = #{phone,jdbcType=VARCHAR},
             </if>
             <if test="photo != null">
                 photo = #{photo,jdbcType=VARCHAR},
@@ -222,7 +222,7 @@
             account = #{account,jdbcType=VARCHAR},
             `password` = #{password,jdbcType=VARCHAR},
             `name` = #{name,jdbcType=VARCHAR},
-            telephone = #{telephone,jdbcType=VARCHAR},
+            phone = #{phone,jdbcType=VARCHAR},
             photo = #{photo,jdbcType=VARCHAR},
             email = #{email,jdbcType=VARCHAR},
             client_id = #{clientId,jdbcType=VARCHAR},

sckw-modules/sckw-example/src/main/resources/mapper/SysUserDao.xml

@@ -7,7 +7,7 @@
     <result column="account" property="account" />
     <result column="password" property="password" />
     <result column="name" property="name" />
-    <result column="telephone" property="telephone" />
+    <result column="phone" property="phone" />
     <result column="photo" property="photo" />
     <result column="email" property="email" />
     <result column="is_main" property="isMain" />
@@ -22,7 +22,7 @@
 
   <select id="findByAccount" parameterType="java.util.Map" resultType="com.sckw.example.model.SysUser">
     SELECT
-      id, system_type systemType, account, password, name, telephone, photo, email, is_main isMain,
+      id, system_type systemType, account, password, name, phone, photo, email, is_main isMain,
       remark, status, create_by createBy, create_time createTime, update_by updateBy, update_time updateTime
     FROM
     sys_user
@@ -37,7 +37,7 @@
 
   <select id="findPage" resultType="java.util.Map" parameterType="java.util.Map" >
     SELECT
-    id, system_type systemType, account, password, name, telephone, photo, email, is_main isMain,
+    id, system_type systemType, account, password, name, phone, photo, email, is_main isMain,
     remark, status, create_by createBy, create_time createTime, update_by updateBy, update_time updateTime
     FROM
     sys_user u

sckw-modules/sckw-message/src/main/java/com/sckw/message/controller/TestMqController.java

@@ -59,7 +59,7 @@ public class TestMqController {
     public HttpResult sendRabbitMq(String name) {
         String uuid = UUID.fastUUID().toString();
         SckwSms sckwSms = new SckwSms();
-        sckwSms.setTelephone("17358629955");
+        sckwSms.setPhone("17358629955");
         sckwSms.setSignName("矿拉拉");
         sckwSms.setTemplateCode(SmsCodeEnum.VERIFICATION_CODE);
         sckwSms.setParams(new HashMap(){{put("code", "123456");}});

sckw-modules/sckw-message/src/main/java/com/sckw/message/model/KwmSms.java

@@ -31,7 +31,7 @@ public class KwmSms extends BaseModel {
     /**
      * 手机号
      */
-    private String telephone;
+    private String phone;
 
     /**
      * 发送内容

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/SckwSmsHandlerService.java

@@ -32,20 +32,20 @@ public class SckwSmsHandlerService {
      */
     public void handler(SckwSms sckwSms) {
         log.info("接收到发送短信消息：{}，开始处理", JSON.toJSONString(sckwSms));
-        String requestKey = getKey(RedisConstant.MESSAGE_SMS_VERIFY_CODE_REQUEST_KEY, sckwSms.getTelephone());
+        String requestKey = getKey(RedisConstant.MESSAGE_SMS_VERIFY_CODE_REQUEST_KEY, sckwSms.getPhone());
         if (Boolean.FALSE.equals(RedissonUtils.tryLock(requestKey, 10L, RedisConstant.SMS_VERIFY_CODE_VALID_TIME))) {
             log.info("重复发送短信消息，不处理");
             return;
         }
-        String valueKey = getKey(RedisConstant.MESSAGE_SMS_VERIFY_CODE_VALUE_KEY, sckwSms.getTelephone());
+        String valueKey = getKey(RedisConstant.MESSAGE_SMS_VERIFY_CODE_VALUE_KEY, sckwSms.getPhone());
         //发送短信
         RedissonUtils.putString(valueKey, String.valueOf(sckwSms.getParams().get("code")), RedisConstant.SMS_VERIFY_CODE_VALID_TIME);
         //发送短信
-        SmsUtil.sendSms(sckwSms.getTelephone(), sckwSms.getSignName(), sckwSms.getTemplateCode().getName(), JSON.toJSONString(sckwSms.getParams()));
+        SmsUtil.sendSms(sckwSms.getPhone(), sckwSms.getSignName(), sckwSms.getTemplateCode().getName(), JSON.toJSONString(sckwSms.getParams()));
         //数据入库
         SmsCodeEnum smsCodeEnum = sckwSms.getTemplateCode();
         KwmSms kwmSms = KwmSms.builder().type(smsCodeEnum.getType()).code(smsCodeEnum.getName())
-                .telephone(sckwSms.getTelephone()).content(smsCodeEnum.getValue())
+                .phone(sckwSms.getPhone()).content(smsCodeEnum.getValue())
                 .params(JSON.toJSONString(sckwSms.getParams())).build();
         kwmSms.setCreateBy(sckwSms.getCreateBy());
         kwmSms.setUpdateBy(sckwSms.getCreateBy());

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/SmsService.java

@@ -43,7 +43,7 @@ public class SmsService {
             throw new BusinessException("请勿频繁获取短信验证码");
         }
         SckwSms sckwSms = new SckwSms();
-        sckwSms.setTelephone(param.getPhone());
+        sckwSms.setPhone(param.getPhone());
         sckwSms.setTemplateCode(SmsCodeEnum.VERIFICATION_CODE);
         Map<String, Object> params = new HashMap<>();
         params.put("code", NumberUtils.createRandomVcode());

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderAddress.java

@@ -52,7 +52,7 @@ public class KwoTradeOrderAddress extends BaseModel {
     /**
      * 联系电话
      */
-    private String telephone;
+    private String phone;
 
     /**
      * 所在地区

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderUnit.java

@@ -52,6 +52,6 @@ public class KwoTradeOrderUnit extends BaseModel {
     /**
      * 联系电话
      */
-    private String telephone;
+    private String phone;
 
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoodsAddress.java

@@ -42,7 +42,7 @@ public class KwpGoodsAddress extends BaseModel {
     /**
      * 联系电话
      */
-    private String telephone;
+    private String phone;
 
     /**
      * 所在地区

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsEnterpriseController.java

@@ -163,7 +163,7 @@ public class KwsEnterpriseController {
     }
 
     /**
-     * @param {entId 变更主账号企业ID, telephone 替换账号，captcha 验证码}
+     * @param {entId 变更主账号企业ID, phone 替换账号，captcha 验证码}
      * @return HttpResult
      * @description 变更主账号（被替换账号冻结）
      * @author zk

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsUserController.java

@@ -81,7 +81,7 @@ public class KwsUserController {
     }
 
     /**
-     * @param params {id：主键ID、systemType:系统类型(1运营端、2企业开户)、account：账号、password：密码、name：姓名、telephone：联系电话
+     * @param params {id：主键ID、systemType:系统类型(1运营端、2企业开户)、account：账号、password：密码、name：姓名、phone：联系电话
      *      *               ，photo：头像，email：邮箱}
      * @description 更新
      * @author zk

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/KwsEnterprise.java

@@ -30,7 +30,7 @@ public class KwsEnterprise extends BaseModel {
     /**
      * 联系电话
      */
-    private String telephone;
+    private String phone;
 
     /**
      * 法人姓名
@@ -40,7 +40,7 @@ public class KwsEnterprise extends BaseModel {
     /**
      * 法人联系电话
      */
-    private String legalTelephone;
+    private String legalPhone;
 
     /**
      * 企业头像

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/KwsUser.java

@@ -34,7 +34,7 @@ public class KwsUser extends BaseModel {
     /**
      * 手机号
      */
-    private String telephone;
+    private String phone;
 
     /**
      * 头像

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/SysUser.java

@@ -17,7 +17,7 @@ public class SysUser implements Serializable {
 
     private String name;
 
-    private String telephone;
+    private String phone;
 
     private String photo;
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/AddEntSettleReqVo.java

@@ -46,7 +46,7 @@ public class AddEntSettleReqVo implements Serializable {
      * 联系电话
      */
     @NotBlank(message = "企业联系电话不能为空")
-    private String telephone;
+    private String phone;
 
     /**
      * 法人姓名
@@ -56,7 +56,7 @@ public class AddEntSettleReqVo implements Serializable {
     /**
      * 法人电话
      */
-    private String legalTelephone;
+    private String legalPhone;
 
     /**
      * 企业头像

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/EntFindPageReqVo.java

@@ -26,7 +26,7 @@ public class EntFindPageReqVo extends PageRequest implements Serializable {
     /**
      * 联系电话
      */
-    private String telephone;
+    private String phone;
 
     /**
      * 法人姓名
@@ -36,7 +36,7 @@ public class EntFindPageReqVo extends PageRequest implements Serializable {
     /**
      * 法人电话
      */
-    private String legalTelephone;
+    private String legalPhone;
 
     /**
      * 审批状态 0未审批、1通过、2未通过、3审批中

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/EntRegisterReqVo.java

@@ -47,7 +47,7 @@ public class EntRegisterReqVo implements Serializable {
     /**
      * 法人电话
      */
-    private String legalTelephone;
+    private String legalPhone;
 
     /**
      * 企业头像

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/KwsEnterpriseReqVo.java

@@ -36,7 +36,7 @@ public class KwsEnterpriseReqVo implements Serializable {
     /**
      * 联系电话
      */
-    private String telephone;
+    private String phone;
 
     /**
      * 法人姓名
@@ -46,7 +46,7 @@ public class KwsEnterpriseReqVo implements Serializable {
     /**
      * 法人联系方式
      */
-    private String legalTelephone;
+    private String legalPhone;
 
     /**
      * 企业头像

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/UserAddReqVo.java

@@ -45,7 +45,7 @@ public class UserAddReqVo implements Serializable {
      * 手机号
      */
     @NotBlank(message = "手机号不能为空")
-    private String telephone;
+    private String phone;
 
     /**
      * 头像

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -23,11 +23,9 @@ import com.sckw.system.api.model.dto.req.RegisterReqDto;
 import com.sckw.system.api.model.dto.res.RegisterResDto;
 import com.sckw.system.dao.*;
 import com.sckw.system.model.*;
-import com.sckw.system.model.pojo.FindMenuTreePojo;
 import com.sckw.system.model.vo.req.*;
 import com.sckw.system.model.vo.res.CertificateResVo;
 import com.sckw.system.model.vo.res.IdResVo;
-import com.sckw.system.model.vo.res.KwsMenuResVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -259,7 +257,7 @@ public class KwsEnterpriseService {
         Long userId = LoginUserHolder.getUserId();
         kwsEnterprise.setCode(reqVo.getCode());
         kwsEnterprise.setLegalName(reqVo.getLegalName());
-        kwsEnterprise.setLegalTelephone(reqVo.getLegalTelephone());
+        kwsEnterprise.setLegalPhone(reqVo.getLegalPhone());
         kwsEnterprise.setHead(reqVo.getHead());
         kwsEnterprise.setRegSource(LoginUserHolder.getClientType());
         kwsEnterprise.setCityCode(reqVo.getCityCode());
@@ -374,7 +372,7 @@ public class KwsEnterpriseService {
         IdResVo idResVo = kwsRoleService.add(addRoleReqVo);
 
         /*3、绑定角色等*/
-        KwsUser userByAccount = kwsUserService.getUserByAccount(kwsEnterprise.getTelephone(), SystemTypeEnum.COMPANY.getCode());
+        KwsUser userByAccount = kwsUserService.getUserByAccount(kwsEnterprise.getPhone(), SystemTypeEnum.COMPANY.getCode());
         if (Objects.isNull(userByAccount)) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
@@ -447,7 +445,7 @@ public class KwsEnterpriseService {
         RegisterReqDto registerReqDto = new RegisterReqDto();
         registerReqDto.setEntName(reqVo.getFirmName());
         registerReqDto.setName(reqVo.getContacts());
-        registerReqDto.setTelephone(reqVo.getTelephone());
+        registerReqDto.setPhone(reqVo.getPhone());
         registerReqDto.setIsMain(Global.YES);
         registerReqDto.setSystemType(SystemTypeEnum.COMPANY.getCode());
         RegisterResDto register = kwsUserService.register(registerReqDto);

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsUserService.java

@@ -17,10 +17,7 @@ import com.sckw.system.model.KwsDept;
 import com.sckw.system.model.KwsEnterprise;
 import com.sckw.system.model.KwsUser;
 import com.sckw.system.model.KwsUserDept;
-import com.sckw.system.model.pojo.FindMenuTreePojo;
 import com.sckw.system.model.vo.req.*;
-import com.sckw.system.model.vo.res.IdResVo;
-import com.sckw.system.model.vo.res.KwsMenuResVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -90,10 +87,10 @@ public class KwsUserService {
         long userId = new IdWorker(1).nextId();
         registerResDto.setUserId(userId);
         kwsUser.setSystemType(reqDto.getSystemType());
-        kwsUser.setAccount(reqDto.getTelephone());
+        kwsUser.setAccount(reqDto.getPhone());
         kwsUser.setPassword(reqDto.getPassword());
         kwsUser.setName(reqDto.getName());
-        kwsUser.setTelephone(reqDto.getTelephone());
+        kwsUser.setPhone(reqDto.getPhone());
         kwsUser.setIsMain(reqDto.getIsMain());
         kwsUser.setId(userId);
 
@@ -114,7 +111,7 @@ public class KwsUserService {
             kwsEnterprise.setFirmName(reqDto.getEntName());
             kwsEnterprise.setApproval(ApprovalEnum.NO.getCode());
             kwsEnterprise.setContacts(reqDto.getName());
-            kwsEnterprise.setTelephone(reqDto.getTelephone());
+            kwsEnterprise.setPhone(reqDto.getPhone());
             registerResDto.setEntId(entId);
             if (kwsEnterpriseDao.insert(kwsEnterprise) <= 0) {
                 throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);

sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -6,9 +6,9 @@
     <result column="firm_name" jdbcType="VARCHAR" property="firmName" />
     <result column="code" jdbcType="VARCHAR" property="code" />
     <result column="contacts" jdbcType="VARCHAR" property="contacts" />
-    <result column="telephone" jdbcType="VARCHAR" property="telephone" />
+    <result column="phone" jdbcType="VARCHAR" property="phone" />
     <result column="legal_name" jdbcType="VARCHAR" property="legalName" />
-    <result column="legal_telephone" jdbcType="VARCHAR" property="legalTelephone" />
+    <result column="legal_phone" jdbcType="VARCHAR" property="legalPhone" />
     <result column="head" jdbcType="VARCHAR" property="head" />
     <result column="integral" jdbcType="INTEGER" property="integral" />
     <result column="balance" jdbcType="DECIMAL" property="balance" />
@@ -34,7 +34,7 @@
   </resultMap>
 
   <sql id="Base_Column_List">
-    id, firm_name, code, contacts, telephone, legal_name, legal_telephone, head, integral, 
+    id, firm_name, code, contacts, phone, legal_name, legal_phone, head, integral,
     balance, experience, member_level, reg_time, reg_source, org_code, city_code, detail_address, 
     lat, lng, approval, approval_time, manager, remark, status, create_by, create_time, 
     update_by, update_time, del_flag
@@ -57,14 +57,14 @@
     <if test="contacts != null and contacts != ''">
       and a.contacts = #{contacts}
     </if>
-    <if test="telephone != null and telephone != ''">
-      and a.telephone = #{telephone}
+    <if test="phone != null and phone != ''">
+      and a.phone = #{phone}
     </if>
     <if test="legalName != null and legalName != ''">
       and a.legal_name = #{legalName}
     </if>
-    <if test="legalTelephone != null and legalTelephone != ''">
-      and a.legal_telephone = #{legalName}
+    <if test="legalPhone != null and legalPhone != ''">
+      and a.legal_phone = #{legalPhone}
     </if>
     <if test="approval != null">
       and a.approval = #{approval}
@@ -114,14 +114,14 @@
       <if test="contacts != null">
         contacts,
       </if>
-      <if test="telephone != null">
-        telephone,
+      <if test="phone != null">
+        phone,
       </if>
       <if test="legalName != null">
         legal_name,
       </if>
-      <if test="legalTelephone != null">
-        legal_telephone,
+      <if test="legalPhone != null">
+        legal_phone,
       </if>
       <if test="head != null">
         head,
@@ -203,14 +203,14 @@
       <if test="contacts != null">
         #{contacts,jdbcType=VARCHAR},
       </if>
-      <if test="telephone != null">
-        #{telephone,jdbcType=VARCHAR},
+      <if test="phone != null">
+        #{phone,jdbcType=VARCHAR},
       </if>
       <if test="legalName != null">
         #{legalName,jdbcType=VARCHAR},
       </if>
-      <if test="legalTelephone != null">
-        #{legalTelephone,jdbcType=VARCHAR},
+      <if test="legalPhone != null">
+        #{legalPhone,jdbcType=VARCHAR},
       </if>
       <if test="head != null">
         #{head,jdbcType=VARCHAR},
@@ -293,14 +293,14 @@
       <if test="contacts != null">
         contacts = #{contacts,jdbcType=VARCHAR},
       </if>
-      <if test="telephone != null">
-        telephone = #{telephone,jdbcType=VARCHAR},
+      <if test="phone != null">
+        phone = #{phone,jdbcType=VARCHAR},
       </if>
       <if test="legalName != null">
         legal_name = #{legalName,jdbcType=VARCHAR},
       </if>
-      <if test="legalTelephone != null">
-        legal_telephone = #{legalTelephone,jdbcType=VARCHAR},
+      <if test="legalPhone != null">
+        legal_phone = #{legalPhone,jdbcType=VARCHAR},
       </if>
       <if test="head != null">
         head = #{head,jdbcType=VARCHAR},

sckw-modules/sckw-system/src/main/resources/mapper/KwsUserDao.xml

@@ -7,7 +7,7 @@
     <result column="account" jdbcType="VARCHAR" property="account" />
     <result column="password" jdbcType="VARCHAR" property="password" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="telephone" jdbcType="VARCHAR" property="telephone" />
+    <result column="phone" jdbcType="VARCHAR" property="phone" />
     <result column="photo" jdbcType="VARCHAR" property="photo" />
     <result column="email" jdbcType="VARCHAR" property="email" />
     <result column="client_id" jdbcType="VARCHAR" property="clientId" />
@@ -22,7 +22,7 @@
   </resultMap>
 
   <sql id="Base_Column_List">
-    id, system_type, account, password, name, telephone, photo, email, client_id, is_main, 
+    id, system_type, account, password, name, phone, photo, email, client_id, is_main,
     remark, status, create_by, create_time, update_by, update_time, del_flag
   </sql>
 
@@ -51,8 +51,8 @@
       <if test="name != null">
         name,
       </if>
-      <if test="telephone != null">
-        telephone,
+      <if test="phone != null">
+        phone,
       </if>
       <if test="photo != null">
         photo,
@@ -104,8 +104,8 @@
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
-      <if test="telephone != null">
-        #{telephone,jdbcType=VARCHAR},
+      <if test="phone != null">
+        #{phone,jdbcType=VARCHAR},
       </if>
       <if test="photo != null">
         #{photo,jdbcType=VARCHAR},
@@ -158,8 +158,8 @@
       <if test="name != null">
         name = #{name,jdbcType=VARCHAR},
       </if>
-      <if test="telephone != null">
-        telephone = #{telephone,jdbcType=VARCHAR},
+      <if test="phone != null">
+        phone = #{phone,jdbcType=VARCHAR},
       </if>
       <if test="photo != null">
         photo = #{photo,jdbcType=VARCHAR},
@@ -212,8 +212,8 @@
     <if test="name != null and name != ''">
       and su.name = #{name, jdbcType=VARCHAR}
     </if>
-    <if test="telephone != null and telephone != ''">
-      and su.telephone = #{telephone, jdbcType=VARCHAR}
+    <if test="phone != null and phone != ''">
+      and su.phone = #{phone, jdbcType=VARCHAR}
     </if>
     <if test="email != null and email != ''">
       and su.email = #{email, jdbcType=VARCHAR}
@@ -242,7 +242,7 @@
   <select id="findList" resultType="com.sckw.system.model.KwsUser" parameterType="com.sckw.system.model.KwsUser" >
     select
       su.id, su.system_type systemType, su.account, su.password, su.name,
-      su.telephone, su.photo, su.email, su.is_main isMain, su.remark, su.status
+      su.phone, su.photo, su.email, su.is_main isMain, su.remark, su.status
     from kws_user su
     where su.del_flag = 0
     <if test="systemType != null and systemType != ''">
@@ -254,8 +254,8 @@
     <if test="name != null and name != ''">
       and su.name = #{name, jdbcType=VARCHAR}
     </if>
-    <if test="telephone != null and telephone != ''">
-      and su.telephone = #{telephone, jdbcType=VARCHAR}
+    <if test="phone != null and phone != ''">
+      and su.phone = #{phone, jdbcType=VARCHAR}
     </if>
     ORDER BY su.create_time desc
   </select>

sckw-modules/sckw-system/src/main/resources/mapper/SysUserDao.xml

@@ -7,7 +7,7 @@
     <result column="account" property="account" />
     <result column="password" property="password" />
     <result column="name" property="name" />
-    <result column="telephone" property="telephone" />
+    <result column="phone" property="phone" />
     <result column="photo" property="photo" />
     <result column="email" property="email" />
     <result column="is_main" property="isMain" />
@@ -89,7 +89,7 @@
 
   <select id="findByAccount" parameterType="java.util.Map" resultType="com.sckw.system.model.SysUser">
     SELECT
-      id, system_type systemType, account, password, name, telephone, photo, email, is_main isMain,
+      id, system_type systemType, account, password, name, phone, photo, email, is_main isMain,
       remark, status, create_by createBy, create_time createTime, update_by updateBy, update_time updateTime
     FROM
     sys_user
@@ -104,7 +104,7 @@
 
   <select id="findPage" resultType="java.util.Map" parameterType="java.util.Map" >
     SELECT
-    id, system_type systemType, account, password, name, telephone, photo, email, is_main isMain,
+    id, system_type systemType, account, password, name, phone, photo, email, is_main isMain,
     remark, status, create_by createBy, create_time createTime, update_by updateBy, update_time updateTime
     FROM
     sys_user u

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtLogisticsOrderAddress.java

@@ -45,7 +45,7 @@ public class KwtLogisticsOrderAddress implements Serializable {
     /**
      * 联系电话
      */
-    private String telephone;
+    private String phone;
 
     /**
      * 所在地区

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtLogisticsOrderUnit.java

@@ -46,7 +46,7 @@ public class KwtLogisticsOrderUnit implements Serializable {
     /**
      * 联系电话
      */
-    private String telephone;
+    private String phone;
 
     /**
      * 备注

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderAddressMapper.xml

@@ -8,7 +8,7 @@
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="type" jdbcType="BIGINT" property="type" />
     <result column="contacts" jdbcType="VARCHAR" property="contacts" />
-    <result column="telephone" jdbcType="VARCHAR" property="telephone" />
+    <result column="phone" jdbcType="VARCHAR" property="phone" />
     <result column="city_code" jdbcType="INTEGER" property="cityCode" />
     <result column="city_name" jdbcType="VARCHAR" property="cityName" />
     <result column="detail_address" jdbcType="VARCHAR" property="detailAddress" />
@@ -25,7 +25,7 @@
     <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, order_id, address_type, `name`, `type`, contacts, telephone, city_code, city_name, 
+    id, order_id, address_type, `name`, `type`, contacts, phone, city_code, city_name,
     detail_address, lat, lng, fence, entry_type, remark, `status`, create_by, create_time, 
     update_by, update_time, del_flag
   </sql>
@@ -41,8 +41,8 @@
   </delete>
   <insert id="insert" parameterType="com.sckw.transport.model.KwtLogisticsOrderAddress">
     insert into kwt_logistics_order_address (id, order_id, address_type, 
-      `name`, `type`, contacts, 
-      telephone, city_code, city_name, 
+      `name`, `type`, contacts,
+      phone, city_code, city_name,
       detail_address, lat, lng, 
       fence, entry_type, remark, 
       `status`, create_by, create_time, 
@@ -50,7 +50,7 @@
       )
     values (#{id,jdbcType=BIGINT}, #{orderId,jdbcType=BIGINT}, #{addressType,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR}, #{type,jdbcType=BIGINT}, #{contacts,jdbcType=VARCHAR}, 
-      #{telephone,jdbcType=VARCHAR}, #{cityCode,jdbcType=INTEGER}, #{cityName,jdbcType=VARCHAR}, 
+      #{phone,jdbcType=VARCHAR}, #{cityCode,jdbcType=INTEGER}, #{cityName,jdbcType=VARCHAR},
       #{detailAddress,jdbcType=VARCHAR}, #{lat,jdbcType=VARCHAR}, #{lng,jdbcType=VARCHAR}, 
       #{fence,jdbcType=VARCHAR}, #{entryType,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, 
       #{status,jdbcType=INTEGER}, #{createBy,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, 
@@ -78,8 +78,8 @@
       <if test="contacts != null">
         contacts,
       </if>
-      <if test="telephone != null">
-        telephone,
+      <if test="phone != null">
+        phone,
       </if>
       <if test="cityCode != null">
         city_code,
@@ -143,8 +143,8 @@
       <if test="contacts != null">
         #{contacts,jdbcType=VARCHAR},
       </if>
-      <if test="telephone != null">
-        #{telephone,jdbcType=VARCHAR},
+      <if test="phone != null">
+        #{phone,jdbcType=VARCHAR},
       </if>
       <if test="cityCode != null">
         #{cityCode,jdbcType=INTEGER},
@@ -208,8 +208,8 @@
       <if test="contacts != null">
         contacts = #{contacts,jdbcType=VARCHAR},
       </if>
-      <if test="telephone != null">
-        telephone = #{telephone,jdbcType=VARCHAR},
+      <if test="phone != null">
+        phone = #{phone,jdbcType=VARCHAR},
       </if>
       <if test="cityCode != null">
         city_code = #{cityCode,jdbcType=INTEGER},
@@ -263,7 +263,7 @@
       `name` = #{name,jdbcType=VARCHAR},
       `type` = #{type,jdbcType=BIGINT},
       contacts = #{contacts,jdbcType=VARCHAR},
-      telephone = #{telephone,jdbcType=VARCHAR},
+        phone = #{phone,jdbcType=VARCHAR},
       city_code = #{cityCode,jdbcType=INTEGER},
       city_name = #{cityName,jdbcType=VARCHAR},
       detail_address = #{detailAddress,jdbcType=VARCHAR},

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderUnitMapper.xml

@@ -8,7 +8,7 @@
     <result column="ent_id" jdbcType="BIGINT" property="entId" />
     <result column="firm_name" jdbcType="VARCHAR" property="firmName" />
     <result column="contacts" jdbcType="VARCHAR" property="contacts" />
-    <result column="telephone" jdbcType="VARCHAR" property="telephone" />
+    <result column="phone" jdbcType="VARCHAR" property="phone" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_by" jdbcType="BIGINT" property="createBy" />
@@ -18,7 +18,7 @@
     <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, order_id, unit_type, ent_id, firm_name, contacts, telephone, remark, `status`, 
+    id, order_id, unit_type, ent_id, firm_name, contacts, phone, remark, `status`,
     create_by, create_time, update_by, update_time, del_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -34,12 +34,12 @@
   <insert id="insert" parameterType="com.sckw.transport.model.KwtLogisticsOrderUnit">
     insert into kwt_logistics_order_unit (id, order_id, unit_type, 
       ent_id, firm_name, contacts, 
-      telephone, remark, `status`, 
+      phone, remark, `status`,
       create_by, create_time, update_by, 
       update_time, del_flag)
     values (#{id,jdbcType=BIGINT}, #{orderId,jdbcType=BIGINT}, #{unitType,jdbcType=INTEGER}, 
       #{entId,jdbcType=BIGINT}, #{firmName,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, 
-      #{telephone,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
+      #{phone,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
       #{createBy,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=BIGINT}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER})
   </insert>
@@ -64,8 +64,8 @@
       <if test="contacts != null">
         contacts,
       </if>
-      <if test="telephone != null">
-        telephone,
+      <if test="phone != null">
+        phone,
       </if>
       <if test="remark != null">
         remark,
@@ -108,8 +108,8 @@
       <if test="contacts != null">
         #{contacts,jdbcType=VARCHAR},
       </if>
-      <if test="telephone != null">
-        #{telephone,jdbcType=VARCHAR},
+      <if test="phone != null">
+        #{phone,jdbcType=VARCHAR},
       </if>
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
@@ -152,8 +152,8 @@
       <if test="contacts != null">
         contacts = #{contacts,jdbcType=VARCHAR},
       </if>
-      <if test="telephone != null">
-        telephone = #{telephone,jdbcType=VARCHAR},
+      <if test="phone != null">
+        phone = #{phone,jdbcType=VARCHAR},
       </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=VARCHAR},
@@ -186,7 +186,7 @@
       ent_id = #{entId,jdbcType=BIGINT},
       firm_name = #{firmName,jdbcType=VARCHAR},
       contacts = #{contacts,jdbcType=VARCHAR},
-      telephone = #{telephone,jdbcType=VARCHAR},
+      phone = #{phone,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
       `status` = #{status,jdbcType=INTEGER},
       create_by = #{createBy,jdbcType=BIGINT},