LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
梁琦涛
2021-08-27 08:51:05 +08:00
parent c81d3142a9 98d5e8ea16
commit da1cf44d90
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/mybatis/MybatisPlusConfig.java
+1 -1
View File
@@ -26,7 +26,7 @@ import java.util.List;
* *
*/ */
@Configuration @Configuration
@MapperScan(value={"com.jero.member.mapper"}) @MapperScan(value={"com.jero.**.mapper*"})
public class MybatisPlusConfig { public class MybatisPlusConfig {
/** /**
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java
+2 -4
View File
@@ -77,11 +77,9 @@ public class MemberProject implements Serializable {
/** /**
* 运行年份 * 运行年份
*/ */
@Excel(name = "运行年份", width = 15, format = "yyyy-MM-dd") @Excel(name = "运行年份", width = 15)
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "运行年份") @ApiModelProperty(value = "运行年份")
private java.time.LocalDate particularYear; private String particularYear;
/** /**
* 负责人id * 负责人id