冲突

src/main/java/com/yc/education/controller/admin/ArticleController.java

@@ -14,7 +14,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
- * @author wuzhiqiang 测试
+ * @author wuzhiqiang 测试   图片上传
  * @create 2019-09-04 14:00
  */
 @Controller