Merge remote-tracking branch 'origin/mater-1.6.0' into mater-1.6.0

admin

2019-08-19 626317c580cce67668481e48e10fc4a4fb818678

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

@@ -62,7 +62,6 @@
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;