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

@@ -107,7 +107,7 @@
     */
    @GetMapping("/technicianListByShopId")
    @ApiOperation(value = "技师列表", tags = {"技师列表-小程序"})
    public R<TableDataInfo> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId) {
    public R<TableDataInfo<TechnicianVO>> technicianListByShopId(@ApiParam("门店id") @RequestParam Long shopId) {
        startPage();
        return R.ok(getDataTable(technicianService.getTechnicianListByShopId(shopId)));
    }