Merge branch 'pre' into 'master'

Pre

See merge request !312

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinArActiveController.java

@@ -34,12 +34,13 @@ public class KylinArActiveController {
     @PostMapping("getUserStatus")
     @ApiOperation("查看用户是否绑定(0没有绑定、1绑定了、2失效[目前失效没有用]")
     public ResponseDto<String> getUserStatus() {
-        String uid = CurrentUtil.getCurrentUid();
-        if(null==dataUtils.getUserStatus(uid)){
-            return  ResponseDto.success("0");
-        }else{
-            return   ResponseDto.success(dataUtils.getUserStatus(uid));
-        }
+        return  ResponseDto.success("1");
+//        String uid = CurrentUtil.getCurrentUid();
+//        if(null==dataUtils.getUserStatus(uid)){
+//            return  ResponseDto.success("0");
+//        }else{
+//            return   ResponseDto.success(dataUtils.getUserStatus(uid));
+//        }
     }
     @PostMapping("exchangeCode")
     @ApiOperation("兑换码兑换")