Browse Source

修改pom文件

syh 5 năm trước cách đây
mục cha
commit
2e69251f14

+ 0 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -14,7 +14,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import it.sauronsoftware.jave.Encoder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 4 - 2
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformancRraise.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.util.Date;
@@ -59,14 +60,15 @@ public class RolePerformancRraise {
     /**
      * 1:快手 2:头条
      */
-    @Excel(name = "1:快手 2:头条", width = 15)
-    @ApiModelProperty(value = "1:快手 2:头条")
+    @Excel(name = "媒体类型", width = 15)
+    @ApiModelProperty(value = "媒体类型")
     private Integer appType;
     /**
      * 是否可用
      */
     @Excel(name = "是否可用", width = 15)
     @ApiModelProperty(value = "是否可用")
+    @Dict(dicCode = "valid_status")
     private Integer enabled;
     /**
      * createTime

+ 4 - 3
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformanceCommission.java

@@ -49,14 +49,15 @@ public class RolePerformanceCommission {
     /**
      * 是否可用 1:可用 2:不可用
      */
-    @Excel(name = "是否可用 1:可用 2:不可用", width = 15)
+    @Excel(name = "是否可用", width = 15)
     @ApiModelProperty(value = "是否可用 1:可用 2:不可用")
+    @Dict(dicCode = "valid_status")
     private Integer enabled;
     /**
      * 1:快手  2:头条
      */
-    @Excel(name = "1:快手  2:头条", width = 15)
-    @ApiModelProperty(value = "1:快手  2:头条")
+    @Excel(name = "媒体类型", width = 15)
+    @ApiModelProperty(value = "媒体类型")
     @Dict(dicCode = "media_type")
     private Integer appType;
     /**