Merge branch 'developer' into 'master'

fix

See merge request !9

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/MemberUnionidRelatedMapper.java

@@ -26,6 +26,6 @@ public interface MemberUnionidRelatedMapper {
 
 	List<MemberUnionidRelated> getByWxUserIdAndWxEnterpriseId(@Param("wxUserId")String wxUserId, @Param("wxEnterpriseId")String wxEnterpriseId);
 
-	MemberUnionidRelatedDTO getByParams(@Param("wxUserId")String wxUserId, @Param("wxEnterpriseId")String wxEnterpriseId, 
+	MemberUnionidRelated getByParams(@Param("wxUserId")String wxUserId, @Param("wxEnterpriseId")String wxEnterpriseId, 
 			@Param("externalName")String name, @Param("addCreateTime")String createTime);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MemberUnionRelatedServiceImpl.java

@@ -47,7 +47,7 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 
 	@Override
 	public MemberUnionidRelatedDTO getByParams(String wxUserId, String wxEnterpriseId, String name, String createTime) {
-		return mapper.getByParams(wxUserId,wxEnterpriseId,name,createTime);
+		return EntityUtil.changeEntityByJSON(MemberUnionidRelatedDTO.class,mapper.getByParams(wxUserId,wxEnterpriseId,name,createTime));
 	}
 
 	@Override