Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-09 a59a646a75425ae5cc265891094592609d69a3da

Merge remote-tracking branch 'origin/master'

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java

@@ -202,6 +202,9 @@
    @ApiModelProperty(value = "区编号")
    @TableField("district_code")
    private String districtCode;
    @ApiModelProperty(value = "区编号")
    @TableField("qr_code")
    private String qrCode;

    @ApiModelProperty("等级1会员数")
    @TableField(exist = false)

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

@@ -140,10 +140,9 @@

    @ApiOperation(value = "列表", tags = {"后台-分享管理"})
    @GetMapping("/manage/list")
    public R<Void> managelist(String name,Integer addType,@RequestParam Integer PageNum,Integer pageSize){

        shareService.lambdaQuery().like(name!=null,Share::getName,name).eq(addType!=null,Share::getAddType,addType).page(Page.of(pageSize,pageSize));
        return R.ok();
    public R<Page<Share>> managelist(String name,Integer addType,@RequestParam Integer PageNum,Integer pageSize){
        Page<Share> page = shareService.lambdaQuery().like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageSize, pageSize));
        return R.ok(page);
    }

    @ApiOperation(value = "设为小程序分享", tags = {"后台-分享管理"})
@@ -153,10 +152,14 @@
        List<Share> list = shareService.lambdaQuery().list();
        if (!list.isEmpty()){
            for (Share share : list) {
                
                share.setAppletShare(0);
            }
            shareService.updateBatchById(list);
        }
        //设置小程序分享
        Share byId = shareService.getById(id);
        byId.setAppletShare(1);
        shareService.updateById(byId);
        return R.ok();
    }