src/main/java/com/xcong/excoin/common/system/controller/LoginController.java
@@ -111,11 +111,7 @@ return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey); } <<<<<<< HEAD // @SubmitRepeat ======= //@SubmitRepeat >>>>>>> feature/撮合交易 @ApiOperation(value = "app注册接口", notes = "app注册接口，验证码必须输入可默认为123456") @PostMapping(value = "/register") public Result register(@RequestBody @Validated RegisterDto registerDto) {
