合并远程并上传w10

Article.java

@@ -5,7 +5,11 @@ public class Article {
     private String url;
     private String content;
     private String author;
+<<<<<<< HEAD
+    private Date publishDate;
+=======
     private String Date publishDate;
+>>>>>>> 81e72ba458591eeb2c3e547f9801e93be758f6eb
     public Article(String title, String url, String content,String author,Date publishDate) {
         this.title = title;
         this.url = url;
@@ -43,6 +47,15 @@ public class Article {
     public void setAuthor(String author){
         this.author= author;
     }
+<<<<<<< HEAD
+    public Date getPublishDate() {
+        return publishDate;
+    }
+    public void setPublishDate(Date publishDate) {
+        this.publishDate = publishDate;
+    }
+=======
+>>>>>>> 81e72ba458591eeb2c3e547f9801e93be758f6eb
     @Override
     public String toString() {
         return "Article{"
@@ -50,4 +63,8 @@ public class Article {
                 + ", url='" + url + '\''
                 + '}';
     }
+<<<<<<< HEAD
+}
+=======
 }
+>>>>>>> 81e72ba458591eeb2c3e547f9801e93be758f6eb

HistoryCommmand.java

@@ -0,0 +1,17 @@
+import java.util.ArrayList;
+import java.util.List;
+
+public class HistoryCommand {
+    // 存储所有输入过的命令
+    private final List<String> commandHistory = new ArrayList<>();
+
+    // 添加命令
+    public void addCommand(String cmd) {
+        commandHistory.add(cmd);
+    }
+
+    // 获取全部历史
+    public List<String> getHistory() {
+        return new ArrayList<>(commandHistory); // 防御性拷贝，避免外部修改
+    }
+}