Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
zhou-hongcheng
2026-03-02 09:10:37 +08:00
3 changed files with 27 additions and 4 deletions
@@ -166,7 +166,7 @@ public class ContractManagePO extends BaseVOEntity{
private Integer automaticFlag;
@ApiModelProperty("出账日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "d", timezone = "GMT+8")
private Date paymentDate;
@ApiModelProperty(name = "主体类型(1-货主,2-客户,3-承运商)")