Merge remote-tracking branch 'origin/master'

jiangping

2025-03-26 707b4da9ac191174864c95738d4b08b506154e02

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java

@@ -1,9 +1,11 @@
package com.doumee.cloud.web;

import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -90,4 +92,19 @@
        return ApiResponse.success("操作成功");
    }

    /**
     * 2025-3-25 14:14:34  加入取消预约 待审批、审批中、已审批
     * @param visitId
     * @param token
     * @return
     */
    @ApiOperation("取消预约")
    @GetMapping("/visitsCancel")
//    @CloudRequiredPermission("business:visits:cancel")
    public ApiResponse visitsCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        LoginUserInfo loginUserInfo = getLoginUser(token);
        visitsService.visitsCancel(visitId,loginUserInfo);
        return ApiResponse.success(null);
    }

}