Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

skyouc

昨天 4ad955ed562ce9add346779791f8678b55b8c2a8

 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);

}