Merge remote-tracking branch 'origin/maanshan' into maanshan

rk

4 天以前 28d2b0a2b33c786670f4999e4b634036de2d6883

 server/meeting/meeting_admin/src/main/java/com/doumee/api/common/CaptchaController.java

@@ -2,7 +2,7 @@

import com.doumee.api.BaseController;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.common.CaptchaService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;