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

zss

3 天以前 cf989c194af04a6a5705abac40fad0cc8cb56301

 src/main/java/com/ruoyi/sales/pojo/SalesLedger.java

@@ -135,5 +135,13 @@
    @ApiModelProperty(value = "交货日期")
    @TableField(value = "delivery_date")
    private LocalDate deliveryDate;

    @TableField(exist = false)
    @ApiModelProperty(value = "交货天数差")
    private Integer deliveryDaysDiff;

    @TableField(exist = false)
    //是否发货(台账页面颜色控制)
    private Boolean isFh;
}