Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-05-24 d4203b001b70bb9bc2af8358f0800b952f3521c5

 phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java

@@ -1,5 +1,7 @@
package com.hz.phis.dt.user;

import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;

import java.math.BigDecimal;
@@ -69,8 +71,11 @@
    private String email;
    /**头像*/
    private String imgUrl;

    private String userBelongingType;

    private String hisId;
    private String userBelongingType;
     //电网咨询顾问(TMK) (Employee id)
    private String internetCorpUserId;
    //所属护士
    private String nurseCorpUserId;

}