Merge remote-tracking branch 'origin/liaoning' into liaoning

pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/ThemeParam.java

@@ -8,9 +8,8 @@ import lombok.EqualsAndHashCode;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -21,7 +20,7 @@ import java.util.List;
  * @createTime 2022/1/12 13:45
  */
 @Data
-public class ThemeParam {
+public class ThemeParam implements Serializable {
 
     @ApiModelProperty("主题名称")
     @NotBlank(message = ValidMessage.NAME_NOT_BLANK)
@@ -29,7 +28,6 @@ public class ThemeParam {
     private String name;
 
     @ApiModelProperty("主题描述")
-    @NotBlank(message = ValidMessage.REMARK_NOT_BLANK)
     @Pattern(regexp = PatternRegex.NORMAL, message = ValidMessage.REMARK_FORMAT_ERROR)
     private String remark;
 
@@ -39,11 +37,11 @@ public class ThemeParam {
     private String color;
 
     @ApiModelProperty("logo图片")
-    @NotNull(message = ValidMessage.LOGO_NOT_BLANK)
+    @NotBlank(message = ValidMessage.LOGO_NOT_BLANK)
     private MultipartFile logoFile;
 
     @ApiModelProperty("favicon图标")
-    @NotNull(message = ValidMessage.FAVICON_NOT_BLANK)
+    @NotBlank(message = ValidMessage.FAVICON_NOT_BLANK)
     private MultipartFile faviconFile;
 
     @ApiModelProperty("切换栏位置")
@@ -84,7 +82,7 @@ public class ThemeParam {
 
     /**
      * 用户更新操作实体
-     *
+     * <p>
      * 需要填写的参数：用户的id
      */
     @Data