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

czkh

1 天以前 975823f4d07c91a67162f553be9ff4ac25f3d47d

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

@@ -7,4 +7,6 @@

    DocType selectOrAdd(String docName, Boolean pakin);

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

}