Commit 5bef0aa88fe6e7dd46acd5c7b92455643b9273a1

Authored by 韩亚云
1 parent 1cf97b1a

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer

# Conflicts:
#	moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/model/RaceNameListInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/model/RaceNameListInfo.java
... ... @@ -198,7 +198,7 @@ public class RaceNameListInfo implements Serializable {
198 198 this.userMsg = userMsg;
199 199 }
200 200  
201   - public static class UserMsgBean implements Serializable {
  201 + public static class UserMsgBean implements Serializable{
202 202 /**
203 203 * image : http://yweb0.cnliveimg.com/images/headImg/2019/0521/1558424757652_small.jpg
204 204 * nickName : 峨眉派掌门候选人
... ...