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

zss

5 天以前 17d65c77c6fedf1b51afec166c5a9735c6e4d38e

 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;