Merge remote-tracking branch 'origin/master'

puzhibing

2026-02-04 85bafa86f44fbe6646019fd8ecbab79f552ccd0a

 xp-service/xp-operation/src/main/java/com/xiaopeng/operation/controller/XpSystemSettingController.java

@@ -1,5 +1,7 @@
package com.xiaopeng.operation.controller;

import com.xiaopeng.api.model.operation.SysOperLog;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.controller.BaseController;
import com.xiaopeng.common.core.web.domain.AjaxResult;
import com.xiaopeng.operation.service.XpSystemSettingService;
@@ -7,9 +9,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@@ -34,6 +34,18 @@
    }


//    @GetMapping("/support/getOrderDistance")
//    @ApiOperation(value = "获取下单距离",tags = {"小程序首页-服务调用获取下单距离"},response = Integer.class)
//    public AjaxResult<Integer> getOrderDistance() {
//        return success(xpSystemSettingService.getOrderDistance());
//    }


    @GetMapping("/support/getOrderDistance")
    @ApiOperation(value = "获取下单距离",tags = {"小程序首页-服务调用获取下单距离"},response = Integer.class)
    public R getOrderDistance() {
        return R.ok(xpSystemSettingService.getOrderDistance());
    }


}