Merge branch 'master' of http://106.53.194.250:13000/lucas/test1234213123

# Conflicts:
#	src/main/java/com/hnucm/springboot/springboot1/service/impl/PersonServiceImpl.java

src/main/java/com/hnucm/springboot/springboot1/dao/OrdersMapper.java

@@ -0,0 +1,12 @@
+package com.hnucm.springboot.springboot1.dao;
+
+import com.hnucm.springboot.springboot1.model.Orders;
+import com.hnucm.springboot.springboot1.model.StuCard;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface OrdersMapper {
+    public List<Orders> findOrdersByPersonId(int personId);
+}

src/main/java/com/hnucm/springboot/springboot1/dao/PersonMapper.java

@@ -0,0 +1,16 @@
+package com.hnucm.springboot.springboot1.dao;
+
+import com.hnucm.springboot.springboot1.model.Person;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface PersonMapper {
+    public List<Person> getAllPersonStuCard();
+    public List<Person> getAllPerson();
+    //int 表示增加的条数
+    public int addPerson(Person person);
+    public int deletePerson(int id);
+    public int updatePerson(Person person);
+}

src/main/java/com/hnucm/springboot/springboot1/dao/StuCardMapper.java

@@ -0,0 +1,17 @@
+package com.hnucm.springboot.springboot1.dao;
+
+import com.hnucm.springboot.springboot1.model.Person;
+import com.hnucm.springboot.springboot1.model.StuCard;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface StuCardMapper {
+    //根据学生证的主键查询对应的学生证信息
+    public StuCard getStuCardById(int id);
+    //增加成功的条数
+    public int addStuCard(StuCard stuCard);
+    // 删除学生卡 根据id
+    public int deleteStuCard(int id);
+}

src/main/java/com/hnucm/springboot/springboot1/service/impl/PersonServiceImpl.java

@@ -13,7 +13,7 @@ import java.util.List;
 @Service
 public class PersonServiceImpl implements PersonService {
     @Autowired
-    private PersonMapper personMapper2;
+    private PersonMapper personMapper1;
 
     @Autowired
     StuCardMapper stuCardMapper2;