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

maven

14 小时以前 f4e70436bb93ab6cc7e2b8c27afa9a5978371855

 src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java

@@ -46,7 +46,7 @@
    private List<String> tempFileIds;
    private List<CommonFile> SalesLedgerFiles;

    private Integer Type;
    private Integer type;
    @ApiModelProperty(value = "签订日期")
    private LocalDate executionDate;