lixing 4 лет назад
Родитель
Сommit
d985065240

+ 2 - 1
fm-person/src/main/java/com/persagy/fm/person/model/ConvertPersonTool.java

@@ -149,6 +149,7 @@ public interface ConvertPersonTool {
      * @version V1.0 2021/4/6 4:55 下午
      */
     @Mappings({
+            @Mapping(target = "accountId", source = "account.id"),
             @Mapping(target = "accountType", source = "account.accountType"),
             @Mapping(target = "accountSource", source = "account.accountSource"),
             @Mapping(target = "headPortrait", source = "account.headPortrait"),
@@ -157,7 +158,7 @@ public interface ConvertPersonTool {
             @Mapping(target = "username", source = "updatePersonDTO.username"),
             @Mapping(target = "phoneNum", source = "updatePersonDTO.phoneNum"),
             @Mapping(target = "mail", source = "updatePersonDTO.mail"),
-            @Mapping(target = "validEndTime", source = "updatePersonDTO.expireDate"),
+            @Mapping(target = "validEndTime", source = "updatePersonDTO.expireDate")
     })
     UpdateSaasAccountDTO convert2UpdateSaasAccountDTO(SaasAccountListItemVO account, UpdatePersonDTO updatePersonDTO);
 

+ 1 - 0
fm-person/src/main/java/com/persagy/fm/saas/account/model/vo/SaasAccountListItemVO.java

@@ -27,4 +27,5 @@ public class SaasAccountListItemVO {
     private Date validStartTime;
     private String username;
     private Integer valid;
+    private String id;
 }