From 5e8c662a674e537d25dd1cf8fb70f9fd86d3c626 Mon Sep 17 00:00:00 2001
From: nicknessii <545310317@qq.com>
Date: Wed, 18 Dec 2019 20:08:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=85=AC=E7=94=A8=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=8A=BD=E5=8F=96=E5=88=B0=E4=B8=8D=E5=90=8C=E5=B1=82=E7=BA=A7?=
 =?UTF-8?q?=E7=9A=84=E7=88=B6=E7=B1=BB=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/github/hcsp/inheritance/Animal.java   | 22 +++++++++++
 .../java/com/github/hcsp/inheritance/Boy.java | 14 ++-----
 .../java/com/github/hcsp/inheritance/Cat.java | 12 ++----
 .../com/github/hcsp/inheritance/Child.java    | 39 +++++++++++++++++++
 .../java/com/github/hcsp/inheritance/Dog.java |  8 +---
 .../com/github/hcsp/inheritance/Girl.java     | 13 +------
 6 files changed, 71 insertions(+), 37 deletions(-)
 create mode 100644 src/main/java/com/github/hcsp/inheritance/Animal.java
 create mode 100644 src/main/java/com/github/hcsp/inheritance/Child.java

diff --git a/src/main/java/com/github/hcsp/inheritance/Animal.java b/src/main/java/com/github/hcsp/inheritance/Animal.java
new file mode 100644
index 0000000..f4d9201
--- /dev/null
+++ b/src/main/java/com/github/hcsp/inheritance/Animal.java
@@ -0,0 +1,22 @@
+package com.github.hcsp.inheritance;
+
+public class Animal {
+    private String name;
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Animal(String name) {
+        this.name = name;
+    }
+
+    public void sayMyName() {
+        System.out.println("我的名字是" + name);
+    }
+}
diff --git a/src/main/java/com/github/hcsp/inheritance/Boy.java b/src/main/java/com/github/hcsp/inheritance/Boy.java
index df1420d..adcc773 100644
--- a/src/main/java/com/github/hcsp/inheritance/Boy.java
+++ b/src/main/java/com/github/hcsp/inheritance/Boy.java
@@ -1,21 +1,13 @@
 package com.github.hcsp.inheritance;
 
-public class Boy {
-    private String name;
-    private int age;
+public class Boy extends Child{
+
 
     public Boy(String name, int age) {
-        this.name = name;
-        this.age = age;
+       super(name,age);
     }
 
-    public void sayMyName() {
-        System.out.println("我的名字是" + name);
-    }
 
-    public void sayMyAge() {
-        System.out.println("我的年龄是" + age);
-    }
 
     public void sayBoy() {
         System.out.println("我是一个男孩");
diff --git a/src/main/java/com/github/hcsp/inheritance/Cat.java b/src/main/java/com/github/hcsp/inheritance/Cat.java
index f8ddea1..1c2de7a 100644
--- a/src/main/java/com/github/hcsp/inheritance/Cat.java
+++ b/src/main/java/com/github/hcsp/inheritance/Cat.java
@@ -1,17 +1,11 @@
 package com.github.hcsp.inheritance;
 
-public class Cat {
-    private String name;
-
+public class Cat extends Animal{
     public Cat(String name) {
-        this.name = name;
-    }
-
-    public void sayMyName() {
-        System.out.println("我的名字是" + name);
+        super(name);
     }
 
-    public void meow() {
+         public void meow() {
         System.out.println("喵");
     }
 }
diff --git a/src/main/java/com/github/hcsp/inheritance/Child.java b/src/main/java/com/github/hcsp/inheritance/Child.java
new file mode 100644
index 0000000..4eaf38b
--- /dev/null
+++ b/src/main/java/com/github/hcsp/inheritance/Child.java
@@ -0,0 +1,39 @@
+package com.github.hcsp.inheritance;
+
+public class Child {
+    private String name;
+    private int age;
+
+    public Child(String name,int age) {
+        this.age = age;
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+
+
+    public void sayMyName() {
+        System.out.println("我的名字是" + name);
+    }
+
+    public void sayMyAge() {
+        System.out.println("我的年龄是" + age);
+    }
+
+
+}
diff --git a/src/main/java/com/github/hcsp/inheritance/Dog.java b/src/main/java/com/github/hcsp/inheritance/Dog.java
index 1122ce1..593e4b2 100644
--- a/src/main/java/com/github/hcsp/inheritance/Dog.java
+++ b/src/main/java/com/github/hcsp/inheritance/Dog.java
@@ -1,15 +1,11 @@
 package com.github.hcsp.inheritance;
 
-public class Dog {
+public class Dog extends Animal{
     private String name;
-
     public Dog(String name) {
-        this.name = name;
+        super(name);
     }
 
-    public void sayMyName() {
-        System.out.println("我的名字是" + name);
-    }
 
     public void wang() {
         System.out.println("汪");
diff --git a/src/main/java/com/github/hcsp/inheritance/Girl.java b/src/main/java/com/github/hcsp/inheritance/Girl.java
index b7a8000..c96126d 100644
--- a/src/main/java/com/github/hcsp/inheritance/Girl.java
+++ b/src/main/java/com/github/hcsp/inheritance/Girl.java
@@ -1,21 +1,12 @@
 package com.github.hcsp.inheritance;
 
-public class Girl {
-    private String name;
-    private int age;
+public class Girl extends Child{
 
     public Girl(String name, int age) {
-        this.name = name;
-        this.age = age;
+        super(name,age);
     }
 
-    public void sayMyName() {
-        System.out.println("我的名字是" + name);
-    }
 
-    public void sayMyAge() {
-        System.out.println("我的年龄是" + age);
-    }
 
     public void sayGirl() {
         System.out.println("我是一个女孩");