Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-07 46670e34c1105649da6091a0829b9451c9fe5b37

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

@@ -31,6 +31,8 @@


    private Date expireTime;

    

    private String code;



    public Integer getUid() {

        return id;

    }