接口修改

ruoyi-system/src/main/java/com/ruoyi/clock/domain/vo/ActivityVo.java

@@ -124,14 +124,14 @@ public class ActivityVo extends BaseEntity {
     /**
      * 活动规则
      */
-    @ExcelProperty(value = "活动规则")
+    //@ExcelProperty(value = "活动规则")
     @ApiModelProperty("活动规则")
     private String activityRules;
 
     /**
      * 活动奖励
      */
-    @ExcelProperty(value = "活动奖励")
+    //@ExcelProperty(value = "活动奖励")
     @ApiModelProperty("活动奖励")
     private String activityRewards;
 
@@ -200,7 +200,7 @@ public class ActivityVo extends BaseEntity {
             ActivityTypeEnum activityTypeEnum =  ActivityTypeEnum.getByCode(this.type,ActivityTypeEnum.values());
             this.typeStr = activityTypeEnum.getMsg();
         }
-        if (ObjectUtil.isNotNull(this.unit)){
+        if (ObjectUtil.isNotNull(this.unit) && this.type.equals(ActivityTypeEnum.SALES.getCode())){
             ActivityUnitEnum activityUnitEnum =  ActivityUnitEnum.getByCode(this.type,ActivityUnitEnum.values());
             this.unitStr = activityUnitEnum.getMsg();
         }