Merge branch 'master' of wangchaoqun/kmall-haikong into master

kmall-admin/src/main/java/com/kmall/admin/haikong/dto/MemberScoreChangeDTO.java

@@ -22,6 +22,7 @@ public class MemberScoreChangeDTO implements Serializable {
     /**
      * 活动积分变动
      */
+    @JsonProperty("activity_score")
     private Integer activityScore;
 
     /**