Merge branch 'master' into div

admin

2019-07-25 07d0a24ad81abeb81fb81f2fab190fdca9770bed

 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;