Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

# Conflicts:
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/StayIntegral.java

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/memberMapper.xml

@@ -44,6 +44,25 @@
 		FROM TB_IAMBERRY_USER_USERINFO
 		WHERE user_openid = #{userOpenid}
 	</select>
+	<!--修改个人信息-->
+	<update id="updateMyMember" parameterType="Member" >
+		UPDATE TB_IAMBERRY_USER_USERINFO
+		<set>
+			<if test="userName!=null||userName!=''">
+				user_name=#{userName},
+			</if>
+			<if test="userTel!=null">
+				user_tel=#{userTel},
+			</if>
+			<if test="userSex!=null">
+				user_sex=#{userSex},
+			</if>
+			<if test="userBirthDate!=null">
+				user_birth_date=#{userBirthDate}
+			</if>
+		</set>
+		WHERE user_openid = #{userOpenid}
+	</update>
 	<!-- 匹配查询会员信息 -->
 	<select id="getMemberByFuzzy" parameterType="Member" resultType="Member">
 		select 

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/order/OrderHandler.java

@@ -63,8 +63,7 @@ import com.iamberry.wechat.tools.ValidatorUtil;
  * Update Date:2016年4月20日
  */
 @Controller
-//@RequestMapping("/wechat/order")
-@RequestMapping("/order")
+@RequestMapping("/wechat/order")
 public class OrderHandler {
 
 	@Autowired