Merge branch 'master' of http://git.dayaedu.com/yonge/mec

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMessageServiceImpl.java

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/SysUserFeignService.java

@@ -3,6 +3,7 @@ package com.ym.mec.auth.api.client;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import com.ym.mec.auth.api.client.fallback.SysUserFeignServiceFallback;
@@ -19,7 +20,7 @@ public interface SysUserFeignService {
 	@GetMapping(value = "user/queryUserByPhone")
 	public SysUser getUserByMobile(@RequestParam("mobile") String mobile);
 
-	@GetMapping(value = "user/add")
+	@PostMapping(value = "user/add")
 	public Object addUser(SysUser user);
 
 	@GetMapping(value = "task/test")

mec-biz/src/main/resources/config/mybatis/SysMessageConfigMapper.xml

@@ -99,8 +99,7 @@
 	</select>
 
 	<select id="queryByType" resultMap="SysMessageConfig">
-		select
-		<include refid="Base_Column_List" />
+		select *
 		from xjd_message_config
 		where message_type_ = #{messageType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 	</select>

mec-biz/src/main/resources/config/mybatis/SysMessageMapper.xml

@@ -46,8 +46,7 @@
 	</sql>
 
     <select id="get" resultMap="message" parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
+		select *
 		from sys_message
 		where id_ = #{id,jdbcType=BIGINT}
 	</select>
@@ -147,7 +146,7 @@
 		where id_ =#{id}
     </update>
 
-    <select id="findCount" parameterType="map" resultType="int">
+    <select id="queryCount" parameterType="map" resultType="int">
 		select count(*) from sys_message
 		<include refid="queryCondition" />
 	</select>
@@ -160,8 +159,7 @@
 	</select>
 
 	<select id="queryByStatusAndTime" resultMap="message">
-		select
-		<include refid="Base_Column_List" />
+		select *
 		from sys_message where status_ = #{status} and <![CDATA[DATE_ADD(CURDATE(),
 		INTERVAL #{recentMin} MINUTE) >= date(send_time_)]]>
 	</select>