From 4e7ae4e9847ca9662f3d27d7bb390ebd2622f343 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 26 Aug 2021 18:25:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E9=A1=B9=E7=9B=AE=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/config/mybatis/MybatisPlusConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/mybatis/MybatisPlusConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/mybatis/MybatisPlusConfig.java index 8bad75e7..d90d84df 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/mybatis/MybatisPlusConfig.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/mybatis/MybatisPlusConfig.java @@ -26,7 +26,7 @@ import java.util.List; * */ @Configuration -@MapperScan(value={"com.jero.member.mapper"}) +@MapperScan(value={"com.jero.**.mapper*"}) public class MybatisPlusConfig { /** From 98d5e8ea16a8ee3ad0908e941a9532acb3b172c0 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 26 Aug 2021 18:25:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=E8=BF=90=E8=A1=8C=E5=B9=B4?= =?UTF-8?q?=E4=BB=BD=E6=94=B9=E4=B8=BAString=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/member/entity/MemberProject.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java index dba3c9e5..13ac0cf5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java @@ -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