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

yaowanxin

2 天以前 a0fa5fa2d82f659a4b3e4a285a1f8603cc93ba86

 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;