Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mobile-web/src/api/promotion.js
#	mobile-web/src/config/request.js

user/user-application/src/main/java/cn/iocoder/mall/user/application/config/MVCConfiguration.java

@@ -49,4 +49,4 @@ public class MVCConfiguration implements WebMvcConfigurer {
         return registrationBean;
     }
 
-}
+}

user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAccessLogAddDTO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -11,7 +12,7 @@ import java.util.Date;
  */
 @Data
 @Accessors(chain = true)
-public class UserAccessLogAddDTO {
+public class UserAccessLogAddDTO implements Serializable {
 
     /**
      * 用户编号 - 空