Merge branch 'dev/2024/0604/update-admin-Y' of feifan/mall-backend-admin into master

添加积分商城所需的参数

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSpuRespVO.java

@@ -139,4 +139,6 @@ public class ProductSpuRespVO {
 
     @Schema(description = "商户id", example = "8240")
     private Long merchantId;
+    @Schema(description = "商品支付类别")
+    private Integer spuPayType;
 }

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/address/AddressController.java

@@ -33,7 +33,7 @@ public class AddressController {
     @Operation(summary = "获得用户收件地址列表")
     @Parameter(name = "userId", description = "用户编号", required = true)
     @PreAuthorize("@ss.hasPermission('member:user:query')")
-    public CommonResult<List<AddressRespVO>> getAddressList(@RequestParam("userId") Long userId,Integer addressType) {
+    public CommonResult<List<AddressRespVO>> getAddressList(@RequestParam("userId") Long userId,@RequestParam(defaultValue = "1")Integer addressType) {
         List<MemberAddressDO> list = addressService.getAddressList(userId,addressType);
         return success(AddressConvert.INSTANCE.convertList2(list));
     }