Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 92ff484325b9af3afd081ec079f74fbc6dd3fea8

 ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageGeneralDetailVO.java

@@ -105,6 +105,7 @@
        private String accountingStatus;

        @ApiModelProperty(value = "入账时间")
        @JsonFormat(pattern = "yyyy-MM-dd")
        private LocalDate accountingDate;

        @ApiModelProperty(value = "会计凭证号")