Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-17 912d2e62391b1459952375a60ba87cfa842f1c41

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserShopController.java

@@ -20,6 +20,13 @@
    @Resource
    private AppUserShopService appUserShopService;

    @PostMapping("/addAppUserShop")
    public R<Void> add(@RequestBody AppUserShop appUserShop) {
        appUserShopService.save(appUserShop);
        return R.ok();
    }


    @GetMapping("/shop/{userId}")
    public R<List<AppUserShop>> getAppUserShop(@PathVariable("userId") Long userId) {
      return R.ok(appUserShopService.list(new LambdaQueryWrapper<AppUserShop>()