Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-06 8cdadf81127b9d34a54d250a3abc878a8d5339c5

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java

@@ -2,11 +2,14 @@


import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.feignClient.OrderClient;
import com.ruoyi.other.service.GoodsEvaluateService;
import com.ruoyi.other.service.TechnicianService;
import com.ruoyi.other.service.TechnicianSubscribeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

import javax.annotation.Resource;
@@ -30,7 +33,8 @@
 */
@RestController
@RequestMapping("/technician")
public class TechnicianController {
@Api(tags = "技师")
public class TechnicianController extends BaseController {
    @Resource
    private TechnicianService technicianService;
    @Resource
@@ -103,8 +107,9 @@
     */
    @GetMapping("/technicianListByShopId")
    @ApiOperation(value = "技师列表", tags = {"技师列表-小程序"})
    public R<List<TechnicianVO>> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId) {
        return R.ok(technicianService.getTechnicianListByShopId(shopId));
    public R<TableDataInfo<TechnicianVO>> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId) {
        startPage();
        return R.ok(getDataTable(technicianService.getTechnicianListByShopId(shopId)));
    }

    /**