Merge remote-tracking branch 'origin/master'

fengxiang

2018-01-26 e125b445697a6b8c2b5cc5c57f31249c5088c1c9

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

@@ -69,7 +69,9 @@
    * @mbggenerated  Thu Dec 07 16:17:21 CST 2017

    */

   private Date expireTime;

	


   private String userName;



   @Transient

   private Organization organization;