Merge remote-tracking branch 'origin/master'

jiangping

2023-12-15 b111c48e3c4608c82ddaaa9c5c976674a1faa3d9

 server/openapi/src/main/java/com/doumee/api/web/BizResourceController.java

@@ -7,8 +7,8 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.openapi.request.*;
import com.doumee.core.model.openapi.response.*;
import com.doumee.core.erp.model.openapi.request.*;
import com.doumee.core.erp.model.openapi.response.*;
import com.doumee.core.utils.Constants;
import com.doumee.service.business.DeviceRoleService;
import com.doumee.service.business.DeviceService;
@@ -151,7 +151,9 @@
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "授权token值", required = true)
    })
    public ApiResponse approveApply(@RequestBody ApproveNoticeRequest account ) {
    public ApiResponse approveApply(@RequestBody ApproveNoticeRequest param) {
        param.setToken(this.getToken());
        erpSyncService.approveApply(param);
        return  ApiResponse.success(null);
    }
}