Merge branch 'cjl' into qa

cjl

2023-10-20 cbdb9ea8d17e07dda2362d1c61e867afe8395ef2

 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;