Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-06-01 abb5a863db85dd62045d7a2f463195d61029c9e5

 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,6 +71,11 @@
    private String email;
    /**头像*/
    private String imgUrl;

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

}