Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

 src/main/java/com/moral/entity/OperateUser.java

@@ -30,7 +30,9 @@
    private Date createTime;



    private Date expireTime;

    


    private String code;



    public Integer getUid() {

        return id;

    }