Merge branch 'dev-login0218' of...

Merge branch 'dev-login0218' of 192.168.110.53:com.pica.cloud.account/pica-cloud-account into dev-login0218

# Conflicts:
#	server/src/main/java/com/pica/cloud/account/account/server/service/impl/LoginServiceImpl.java

server/src/main/java/com/pica/cloud/account/account/server/controller/AutoCodeController.java

@@ -71,6 +71,14 @@ public class AutoCodeController extends AccountBaseController {
     }
 
 
+    /**
+     * @Description native获取验证码，新老版本兼容 todo joy
+     * @Author peijun.zhao
+     * @Date 2020/2/28 9:55
+     * @ModifyDate 2020/2/28 9:55
+     * @Params [entity, req]
+     * @Return com.pica.cloud.foundation.entity.PicaResponse
+     */
     @ApiOperation("获取短信验证码,无需图形验证码,如app端")
     @PostMapping(value = "/authCode")
     public PicaResponse getAuthCode(@RequestBody EncryptEntity entity, HttpServletRequest req) throws Exception {
@@ -96,6 +104,14 @@ public class AutoCodeController extends AccountBaseController {
         }
     }
 
+    /**
+     * @Description web获取效验码-老版，记录风控行为 todo joy
+     * @Author peijun.zhao
+     * @Date 2020/2/28 9:52
+     * @ModifyDate 2020/2/28 9:52
+     * @Params [entity]
+     * @Return com.pica.cloud.foundation.entity.PicaResponse<java.lang.String>
+     */
     @ApiOperation("获取短信验证码，需要图形验证码,如H5端和PC端；验证码类型 0默认 1注册 2微信登录绑定手机 3修改手机 4重置密码 5忘记密码 7患者招募提交问卷(效验)")
     @PostMapping("/account/authCode")
     public PicaResponse<String> getAuthCodeWithCaptcha(@RequestBody EncryptEntity entity,