--no commit message

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/mapper/member/MemberMapper.java

@@ -59,7 +59,7 @@ public interface MemberMapper extends BaseMapper<Member>{
 	 * @date: 2019年4月9日 下午8:11:30
 	 */
 	@Select(" <script> "
-			+ " select m.id,m.name as userName, m.phone,s.name as schoolName,s.address from me_member m "
+			+ " select m.id as memberId,m.name as userName, m.phone,s.name as schoolName,s.address from me_member m "
 			+ " left join me_school s on m.relationId = s.id "
 			+ " WHERE  1=1 "
 			+ "<if test = 'query.relationId != null'> "  

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/mapper/message/MessageRecordMapper.java

@@ -18,8 +18,8 @@ public interface MessageRecordMapper extends BaseMapper<MessageRecord>{
 			+ " <if test = '" + NOTBLANK + "(query.title)'> "  
 		    + " and m.title like concat('%',#{query.title},'%') "
 		    + " </if> " 
-		    + " <if test = '" + NOTBLANK + "(query.startTime)'> "  
-		    + " and m.sendTime <![CDATA[ >= ]]> #{query.startTime} "
+		    + " <if test = '" + NOTBLANK + "(query.beginTime)'> "  
+		    + " and m.sendTime <![CDATA[ >= ]]> #{query.beginTime} "
 		    + " </if> " 
 		    + " <if test = '" + NOTBLANK + "(query.endTime)'> "  
 		    + " and m.sendTime <![CDATA[ <= ]]> #{query.endTime} "

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/controller/member/MemberSignedController.java

@@ -20,7 +20,7 @@ import tk.mybatis.mapper.entity.Example.Criteria;
 import com.zrqx.bg.sysuser.service.member.MemberSignedService;
 import com.zrqx.core.constant.sysuser.SysUserRequestPath;
 import com.zrqx.core.form.sysuser.bg.member.QueryMemberSignedForm;
-import com.zrqx.core.model.sysuser.member.MemberSigned;
+import com.zrqx.core.model.sysuser.member.FgMemberSigned;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
@@ -37,7 +37,7 @@ public class MemberSignedController {
 
 	@ApiOperation(value = "查询签到记录", notes = "按条件分页查询签到记录")
 	@RequestMapping(value = SysUserRequestPath.PAGE, method = RequestMethod.GET)
-	public CallBack<PageInfo<MemberSigned>> getPageList(QueryMemberSignedForm entity, PageParam pageParam) {
+	public CallBack<PageInfo<FgMemberSigned>> getPageList(QueryMemberSignedForm entity, PageParam pageParam) {
 		if (null != pageParam && StringUtils.isBlank(pageParam.getOrderBy())) {
 			pageParam.setOrderBy("createTime desc");
 		}

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/mapper/member/MemberSignedMapper.java

@@ -4,13 +4,13 @@ import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
 
 import com.zrqx.core.mapper.BaseMapper;
-import com.zrqx.core.model.sysuser.member.MemberSigned;
+import com.zrqx.core.model.sysuser.member.FgMemberSigned;
 /**
  * 会员签到
  * @author pc
  *
  */
-public interface MemberSignedMapper extends BaseMapper<MemberSigned> {
+public interface MemberSignedMapper extends BaseMapper<FgMemberSigned> {
 	@Delete("<script>"
             + "delete  FROM sys_member_signed WHERE memberAccount IN "
             + "<foreach item='item' index='index' collection='array' open='(' separator=',' close=')'>"

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/mapper/member/ScoreRecordMapper.java

@@ -4,13 +4,13 @@ import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
 
 import com.zrqx.core.mapper.BaseMapper;
-import com.zrqx.core.model.sysuser.member.ScoreRecord;
+import com.zrqx.core.model.sysuser.member.FgScoreRecord;
 /**
  * 积分记录
  * @author pc
  *
  */
-public interface ScoreRecordMapper extends BaseMapper<ScoreRecord> {
+public interface ScoreRecordMapper extends BaseMapper<FgScoreRecord> {
 	@Delete("<script>"
             + "delete  FROM sys_score_record WHERE memberAccount IN "
             + "<foreach item='item' index='index' collection='array' open='(' separator=',' close=')'>"

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/service/member/MemberSignedService.java

 package com.zrqx.bg.sysuser.service.member;
 
-import com.zrqx.core.model.sysuser.member.MemberSigned;
+import com.zrqx.core.model.sysuser.member.FgMemberSigned;
 import com.zrqx.core.service.BaseService;
 /**
  * 会员签到
  * @author pc
  *
  */
-public interface MemberSignedService extends BaseService<MemberSigned, Integer> {
+public interface MemberSignedService extends BaseService<FgMemberSigned, Integer> {
 }

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/service/member/MemberSignedServiceImpl.java

@@ -5,7 +5,7 @@ import org.springframework.stereotype.Service;
 
 import com.zrqx.bg.sysuser.mapper.member.MemberSignedMapper;
 import com.zrqx.core.mapper.BaseMapper;
-import com.zrqx.core.model.sysuser.member.MemberSigned;
+import com.zrqx.core.model.sysuser.member.FgMemberSigned;
 import com.zrqx.core.service.BaseServiceImpl;
 /**
  * 会员签到
@@ -13,12 +13,12 @@ import com.zrqx.core.service.BaseServiceImpl;
  *
  */
 @Service
-public class MemberSignedServiceImpl extends BaseServiceImpl<MemberSigned, Integer> implements MemberSignedService {
+public class MemberSignedServiceImpl extends BaseServiceImpl<FgMemberSigned, Integer> implements MemberSignedService {
 	@Autowired
 	private MemberSignedMapper memberSignedMapper;
 
 	@Override
-	public BaseMapper<MemberSigned> getMapper() {
+	public BaseMapper<FgMemberSigned> getMapper() {
 		return memberSignedMapper;
 	}
 

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/service/member/ScoreRecordService.java

 package com.zrqx.bg.sysuser.service.member;
 
-import com.zrqx.core.model.sysuser.member.ScoreRecord;
+import com.zrqx.core.model.sysuser.member.FgScoreRecord;
 import com.zrqx.core.service.BaseService;
 /**
  * 积分记录
  * @author pc
  *
  */
-public interface ScoreRecordService extends BaseService<ScoreRecord, Integer> {
+public interface ScoreRecordService extends BaseService<FgScoreRecord, Integer> {
 	
 }

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/service/member/ScoreRecordServiceImpl.java

@@ -5,7 +5,7 @@ import org.springframework.stereotype.Service;
 
 import com.zrqx.bg.sysuser.mapper.member.ScoreRecordMapper;
 import com.zrqx.core.mapper.BaseMapper;
-import com.zrqx.core.model.sysuser.member.ScoreRecord;
+import com.zrqx.core.model.sysuser.member.FgScoreRecord;
 import com.zrqx.core.service.BaseServiceImpl;
 /**
  * 积分记录
@@ -13,11 +13,11 @@ import com.zrqx.core.service.BaseServiceImpl;
  *
  */
 @Service
-public class ScoreRecordServiceImpl extends BaseServiceImpl<ScoreRecord, Integer> implements ScoreRecordService {
+public class ScoreRecordServiceImpl extends BaseServiceImpl<FgScoreRecord, Integer> implements ScoreRecordService {
 	@Autowired
 	private ScoreRecordMapper scoreRecordMapper;
 	@Override
-	public BaseMapper<ScoreRecord> getMapper() {
+	public BaseMapper<FgScoreRecord> getMapper() {
 		return scoreRecordMapper;
 	}