Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 a1557f3f07287c86e8a4a408f03ba19993e5a48c

 cloud-server-other/src/main/java/com/dsh/other/mapper/BannerMapper.java

@@ -4,6 +4,7 @@
import com.dsh.other.entity.Banner;
import com.dsh.other.feignclient.model.AdvertisementChangeStateDTO;
import com.dsh.other.feignclient.model.AdvertisementQuery;
import com.dsh.other.model.BannerVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.PathVariable;

@@ -28,5 +29,5 @@

    String getFirst();

    List<Banner> list1(Integer position);
    List<BannerVo> list1(Integer position);
}