Merge remote-tracking branch 'origin/main'

# Conflicts:
#	flowers-SpringProject/src/bean-ioc.xml
#	flowers-SpringProject/src/com/ssm/ioc/TestIoc.java

flowers-SpringProject/src/bean-ioc.xml

@@ -10,13 +10,4 @@
         <property name="orderDate" value="2026-04-10 15:00:00"/>
         <property name="totalPrice" value="99.8"/>
     </bean>
-
-    <bean id="banner" class="com.ssm.ioc.Banner">
-        <property name="id" value="BAN001"/>
-        <property name="title" value="春季花卉特惠"/>
-        <property name="imgUrl" value="/img/banner1.jpg"/>
-        <property name="linkUrl" value="/flower/list"/>
-        <property name="sort" value="1"/>
-        <property name="status" value="启用"/>
-    </bean>
 </beans>

flowers-SpringProject/src/com/ssm/ioc/TestIoc.java

@@ -2,9 +2,7 @@ package com.ssm.ioc;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.beans.propertyeditors.CustomDateEditor;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+
 /**
  * Spring IoC测试类
  * 符合作业要求：包含整个小组所有模块的对象信息输出
@@ -24,15 +22,5 @@ public class TestIoc {
         System.out.println("下单日期：" + order.getOrderDate());
         System.out.println("订单总金额：" + order.getTotalPrice());
         System.out.println("完整订单信息：" + order + "\n");
-
-        System.out.println("===== 6. 轮播列表模块信息 =====");
-        Banner banner = context.getBean("banner", Banner.class);
-        System.out.println("轮播ID：" + banner.getId());
-        System.out.println("轮播标题：" + banner.getTitle());
-        System.out.println("图片地址：" + banner.getImgUrl());
-        System.out.println("跳转链接：" + banner.getLinkUrl());
-        System.out.println("排序序号：" + banner.getSort());
-        System.out.println("启用状态：" + banner.getStatus());
-        System.out.println("完整轮播信息：" + banner + "\n");
     }
 }