Merge branch 'master' of http://git.gdatac.com/sundelong/cnooc_zydeepen-cggl_expert-manage-miniapp

mege

src/main/java/com/cnooc/expert/external/expert/model/response/ExpertInfoResp.java

 package com.cnooc.expert.external.expert.model.response;
 
+import com.cnooc.expert.system.entity.pojo.CurrentUserInfo;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -8,6 +9,8 @@ import java.util.List;
 @Data
 public class ExpertInfoResp {
 
+    private CurrentUserInfo userInfo;
+
     private String  shenFenZheng;
 
     private Long subjectId;

src/main/java/com/cnooc/expert/system/entity/pojo/CurrentUserInfo.java

+package com.cnooc.expert.system.entity.pojo;
+
+import lombok.Data;
+
+@Data
+public class CurrentUserInfo {
+    private Long userId;
+    private Long accId;
+    private Integer accType;
+    private Long personId;
+    private String name;
+    private String code;
+    private SubjectInfo subjectInfo;
+}

src/main/java/com/cnooc/expert/system/entity/pojo/SubjectInfo.java

+package com.cnooc.expert.system.entity.pojo;
+
+import lombok.Data;
+
+@Data
+public class SubjectInfo {
+    private Long id;
+    private String name;
+    private String code;
+    private Integer subjectType;
+    private String signCode;
+}

src/main/java/com/cnooc/expert/system/entity/pojo/ZhuanJiaUser.java

@@ -37,6 +37,12 @@ public class ZhuanJiaUser {
 
     private String adAccount;
 
+    private String tuiKuYuanYin;
 
+    private String fuJianGuids;
+
+    private Short shenPiZhuangTai;
+
+    private CurrentUserInfo userInfo;
 
 }