From 275f338495f3e694ccf6fa909fb78b949a67921c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 10 May 2021 13:06:20 +0800
Subject: [PATCH] screen-manage 修改前台用户模块
---
screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationVO.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationVO.java
index 5d8af57..e7b89c7 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationVO.java
@@ -2,6 +2,7 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
+import com.moral.api.pojo.vo.user.UserVO;
import com.moral.constant.ResponseCodeEnum;
import lombok.Data;
@@ -13,7 +14,7 @@
* @Version TODO
**/
@Data
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
+//@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class OrganizationVO {
private Integer id;
@@ -32,11 +33,11 @@
private Integer areaCode;
- private Long townCode;
+ private String ProvinceCityAreaName;
- private Long villageCode;
+ private Integer locationLevelCode;
- private String locationLevel;
+ private String locationLevelName;
private String address;
@@ -54,4 +55,6 @@
private String isDelete;
+ private UserVO adminUser;
+
}
--
Gitblit v1.8.0