Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6

whycq

2023-10-11 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547

 src/main/java/com/zy/asrs/service/DocTypeService.java

@@ -5,6 +5,6 @@

public interface DocTypeService extends IService<DocType> {

    DocType selectOrAdd(String docName);
    DocType selectOrAdd(String docName, Boolean pakin);

}