Merge remote-tracking branch 'origin/master'

2021-08-27 08:51:05 +08:00
parent c81d3142a9 98d5e8ea16
commit da1cf44d90
2 changed files with 3 additions and 5 deletions
@@ -26,7 +26,7 @@ import java.util.List;
 *
 */
@Configuration
-@MapperScan(value={"com.jero.member.mapper"})
+@MapperScan(value={"com.jero.**.mapper*"})
 public class MybatisPlusConfig {

    /**
@@ -77,11 +77,9 @@ public class MemberProject implements Serializable {
    /**
     * 运行年份
     */
-    @Excel(name = "运行年份", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "运行年份", width = 15)
    @ApiModelProperty(value = "运行年份")
-    private java.time.LocalDate particularYear;
+    private String particularYear;

    /**
     * 负责人id