Merge branch 'master' of http://106.53.194.250:13000/Liao/work1.3

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

HELP.md

@@ -0,0 +1,31 @@
+# Getting Started
+
+### Reference Documentation
+
+For further reference, please consider the following sections:
+
+* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html)
+* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/3.3.3/maven-plugin)
+* [Create an OCI image](https://docs.spring.io/spring-boot/3.3.3/maven-plugin/build-image.html)
+* [Spring Configuration Processor](https://docs.spring.io/spring-boot/docs/3.3.3/reference/htmlsingle/index.html#appendix.configuration-metadata.annotation-processor)
+* [Spring Boot DevTools](https://docs.spring.io/spring-boot/docs/3.3.3/reference/htmlsingle/index.html#using.devtools)
+* [Thymeleaf](https://docs.spring.io/spring-boot/docs/3.3.3/reference/htmlsingle/index.html#web.servlet.spring-mvc.template-engines)
+* [Spring Web](https://docs.spring.io/spring-boot/docs/3.3.3/reference/htmlsingle/index.html#web)
+
+### Guides
+
+The following guides illustrate how to use some features concretely:
+
+* [Handling Form Submission](https://spring.io/guides/gs/handling-form-submission/)
+* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/)
+* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/)
+* [Building REST services with Spring](https://spring.io/guides/tutorials/rest/)
+
+### Maven Parent overrides
+
+Due to Maven's design, elements are inherited from the parent POM to the project POM.
+While most of the inheritance is fine, it also inherits unwanted elements like `<license>` and `<developers>` from the
+parent.
+To prevent this, the project POM contains empty overrides for these elements.
+If you manually switch to a different parent and actually want the inheritance, you need to remove those overrides.
+

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

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