瀏覽代碼

Merge pull request 'yinruoxi:' (#34) from dev_nlt into dev

Reviewed-on: http://39.105.23.186:3000/develop/digimeta-MultiSaas/pulls/34
tags/B.1.2.0.0_20230819_base^2
yinruoxi 2 年之前
父節點
當前提交
5cec3d69c7
共有 2 個文件被更改,包括 5 次插入8 次删除
  1. +2
    -2
      xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/organize/feign/RemoteEnterpriseService.java
  2. +3
    -6
      xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/organize/controller/SysEnterpriseController.java

+ 2
- 2
xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/organize/feign/RemoteEnterpriseService.java 查看文件

@@ -23,6 +23,6 @@ public interface RemoteEnterpriseService {
*
* @return 结果
*/
@GetMapping("/info/{enterpriseId}")
R<SysEnterpriseDto> getInfo(@PathVariable Long enterpriseId);
@GetMapping("/enterprise/info")
R<SysEnterpriseDto> getInfo(@RequestParam(value = "enterpriseId") Long enterpriseId);
}

+ 3
- 6
xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/organize/controller/SysEnterpriseController.java 查看文件

@@ -8,10 +8,7 @@ import com.xueyi.common.web.entity.controller.BaseController;
import com.xueyi.system.api.organize.domain.dto.SysEnterpriseDto;
import com.xueyi.system.api.organize.domain.query.SysEnterpriseQuery;
import com.xueyi.system.organize.service.ISysEnterpriseService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

/**
* 企业管理 业务处理
@@ -30,8 +27,8 @@ public class SysEnterpriseController extends BaseController<SysEnterpriseQuery,
/**
* 获取企业信息 | 服务间调用
*/
@GetMapping("/info/{enterpriseId}")
public R<SysEnterpriseDto> getInfo(@PathVariable Long enterpriseId) {
@GetMapping("/info")
public R<SysEnterpriseDto> getInfo(@RequestParam(value = "enterpriseId") Long enterpriseId) {
return R.ok(baseService.selectById(enterpriseId));
}



Loading…
取消
儲存