Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-17 425501a2e9202068f980a63a1d20fdd637bb152c

 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>()