Merge remote-tracking branch 'origin/master'

fs-service-system/src/main/java/com/fs/store/mapper/FsUserMapper.java

@@ -171,7 +171,7 @@ public interface FsUserMapper
     @Select("select * from fs_user where mp_open_id=#{openid}")
     FsUser selectFsUserByMpOpenId(String openid);
 
-    @Select("select * from fs_user where union_id=#{unionId}")
+    @Select("select * from fs_user where union_id=#{unionId} order by user_id desc limit 1")
     FsUser selectFsUserByUnionId(String unionId);
 
     @Select("select * from fs_user where course_ma_open_id=#{openId}")