Merge branch 'jtwy' into dev_New

zss

昨天 64027e45c5b0d9dfe1a5536f30ca9183af24b456

 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;