--no commit message

app/member/src/main/java/com/zrqx/member/bg/omember/mapper/OrganMemberMapper.java

@@ -44,7 +44,7 @@ public interface OrganMemberMapper extends BaseMapper<OrganMember>{
 	
 	
 	@Select("<script>"
-			+ " select m.id,account,mp.orderType,m.status,o.name,m.createTime,relatedResourceTypes from m_Member m "
+			+ " select m.id,account,mp.orderType,m.status,o.name,DATE_FORMAT(m.createTime,'%Y-%m-%d %H:%i:%s') createTime,relatedResourceTypes from m_Member m "
 			+ " left join m_Organ_Member om "
 			+ " on m.id = om.id "
 			+ " left join m_Organ o "

app/member/src/main/java/com/zrqx/member/commons/vo/bg/member/OrganMemberVO.java

 package com.zrqx.member.commons.vo.bg.member;
 
-import java.sql.Date;
 import java.util.List;
 
 import com.zrqx.member.commons.form.bg.resource.SaveDiyTypeForm;
@@ -28,7 +27,7 @@ public class OrganMemberVO {
 	@ApiModelProperty(value = "类型：0试用，1正式")
 	private Integer type;
 	@ApiModelProperty("创建时间")
-	private Date createTime;
+	private String createTime;
 	@ApiModelProperty(value = "到期时间")
 	private String endTime;
 	@ApiModelProperty(value = "资源权限 自定义分类code")