Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-31 758be4456bb88c8c7fd008d1aa38cb64783880ee

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java

@@ -62,6 +62,7 @@
import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;

import com.yeshi.fanli.util.wx.WXLoginUtil;



import net.sf.json.JSONObject;