Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/team/BaseTeamService.java

@@ -117,7 +117,7 @@ public class BaseTeamService extends BaseJpaService<BaseTeamDO, BaseTeamDao> {
    }
    public List<Map<String,Object>> findMembers(String teamCode, String name) {
        String sql = "SELECT " +
        String sql = "SELECT Distinct" +
                " d.*,h.org_code,h.org_name,h.org_name,h.dept_code,h.dept_name " +
                "FROM " +
                " base_team_member m, " +