Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-05-20 e7bc156f901b06e5af54cfe86fe53e7491af7b7f

 screen-manage/src/main/java/com/moral/api/pojo/vo/user/UserVO.java

@@ -11,19 +11,23 @@
 * @Version TODO
 **/
@Data
@JsonInclude(JsonInclude.Include.NON_EMPTY)
//@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class UserVO {

    private Integer id;

    private String account;

    private String userName;

    private String organizationName;

    private String email;

    private String mobile;

    private String wechat;

    private String createTime;

    private String expireTime;