Merge remote-tracking branch 'origin/master'

mitao

2024-06-05 e1f5ba620ad2f0b3f62c1faa45ad65a854a3c79a

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberAddressController.java

@@ -1,21 +1,19 @@
package com.ruoyi.member.controller.forepart;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.member.dto.MemberAddressDTO;

import com.ruoyi.member.domain.vo.RegionVo;
import com.ruoyi.system.api.domain.dto.MemberAddressDTO;
import com.ruoyi.member.service.IMemberAddressService;
import com.ruoyi.member.service.IRegionService;
import com.ruoyi.system.api.domain.MemberAddress;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
@@ -35,10 +33,10 @@
     *
     */

    @ApiModelProperty
    @Resource
    private IMemberAddressService iMemberAddressService;

    @ApiModelProperty
    @Resource
    private IRegionService  IRegionService;