bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2024-12-20 10:02:18 +08:00
parent ba21aaa529 1d3d486961
commit dbedaa1a3e
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-common-biz/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.bonus</groupId> <groupId>com.bonus</groupId>
<artifactId>bonus</artifactId> <artifactId>bonus</artifactId>
<version>24.11.0-SNAPSHOT</version> <version>24.12.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
bonus-modules/bonus-material-mall/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.bonus</groupId> <groupId>com.bonus</groupId>
<artifactId>bonus-modules</artifactId> <artifactId>bonus-modules</artifactId>
<version>24.11.0-SNAPSHOT</version> <version>24.12.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -101,7 +101,7 @@
<dependency> <dependency>
<groupId>com.bonus</groupId> <groupId>com.bonus</groupId>
<artifactId>bonus-common-biz</artifactId> <artifactId>bonus-common-biz</artifactId>
<version>24.11.0-SNAPSHOT</version> <version>24.12.0-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

9
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
View File

@ -4,6 +4,7 @@ import com.bonus.common.core.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@ -54,11 +55,13 @@ public class OrderDetailDto {
private String typeName; private String typeName;
@ApiModelProperty(value = "租期开始时间") @ApiModelProperty(value = "租期开始时间")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date rentBeginTime; private Date rentBeginTime;
@ApiModelProperty(value = "租期结束时间") @ApiModelProperty(value = "租期结束时间")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date rentEndTime; private Date rentEndTime;
@ApiModelProperty(value = "订单原始天数") @ApiModelProperty(value = "订单原始天数")
@ -93,10 +96,12 @@ public class OrderDetailDto {
@ApiModelProperty(value = "创建日期") @ApiModelProperty(value = "创建日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
@ApiModelProperty(value = "修改日期") @ApiModelProperty(value = "修改日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime; private Date updateTime;
@ApiModelProperty(value = "出库人") @ApiModelProperty(value = "出库人")

2
bonus-modules/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.bonus</groupId> <groupId>com.bonus</groupId>
<artifactId>bonus</artifactId> <artifactId>bonus</artifactId>
<version>24.11.0-SNAPSHOT</version> <version>24.12.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
pom.xml
View File

@ -6,14 +6,14 @@
<groupId>com.bonus</groupId> <groupId>com.bonus</groupId>
<artifactId>bonus</artifactId> <artifactId>bonus</artifactId>
<version>24.11.0-SNAPSHOT</version> <version>24.12.0-SNAPSHOT</version>
<name>bonus</name> <name>bonus</name>
<url>http://www.ahbonus.cn</url> <url>http://www.ahbonus.cn</url>
<description>博诺思微服务系统</description> <description>博诺思微服务系统</description>
<properties> <properties>
<bonus.version>24.11.0-SNAPSHOT</bonus.version> <bonus.version>24.12.0-SNAPSHOT</bonus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>