Merge remote-tracking branch 'origin/master'

.gitignore

@@ -0,0 +1,21 @@
#project files
*.iml
.idea/*
target/*
# ---> Java
*/target
*.class
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.ear
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*#
# thrift generate code

src/main/java/com/yihu/ehr/organization/service/OrgDeptClient.java

@@ -129,7 +129,7 @@ public interface OrgDeptClient {
            @ApiParam(name = "orgId", value = "机构ID")
            @RequestParam(value = "orgId") String orgId);
    @RequestMapping(value =ApiVersion.Version1_0 + "/orgDept/getOrgDeptByDeptName", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @RequestMapping(value ="/orgDept/getOrgDeptByDeptName", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "检查机构下部门相同名称的个数")
    MOrgDept getOrgDeptByDeptName(
            @ApiParam(name = "orgId", value = "机构ID")