소스 검색

活动信息

pengcheng 1 개월 전
부모
커밋
65d892fefb

+ 3 - 3
ruoyi-system/src/main/java/com/ruoyi/clock/domain/bo/BasicInfoBo.java

@@ -28,21 +28,21 @@ public class BasicInfoBo extends BaseEntity {
      * 主键id
      */
     @ApiModelProperty(value = "主键id", required = true)
-    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    //@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
     private Long basicId;
 
     /**
      * 关于我们
      */
     @ApiModelProperty(value = "关于我们", required = true)
-    @NotBlank(message = "关于我们不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "关于我们不能为空", groups = { AddGroup.class, EditGroup.class })
     private String aboutUs;
 
     /**
      * 隐私协议
      */
     @ApiModelProperty(value = "隐私协议", required = true)
-    @NotBlank(message = "隐私协议不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "隐私协议不能为空", groups = { AddGroup.class, EditGroup.class })
     private String protocol;
 
 

+ 2 - 1
ruoyi-system/src/main/java/com/ruoyi/clock/domain/vo/AdVo.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +20,7 @@ import java.util.Date;
 @Data
 @ApiModel("广告视图对象")
 @ExcelIgnoreUnannotated
-public class AdVo {
+public class AdVo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 

+ 1 - 0
ruoyi-system/src/main/java/com/ruoyi/clock/service/impl/BasicInfoServiceImpl.java

@@ -51,6 +51,7 @@ public class BasicInfoServiceImpl implements IBasicInfoService {
     public Boolean saveBasicInfo(BasicInfoBo bo) {
         BasicInfo basicInfo = this.queryBasicInfo();
         if(ObjectUtil.isEmpty(basicInfo)){
+            basicInfo = BeanCopyUtils.copy(bo, BasicInfo.class);
             this.baseMapper.insert(basicInfo);
         } else {
             basicInfo.setAboutUs(bo.getAboutUs());