Merge remote-tracking branch 'origin/master'

sinake

5 天以前 ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceInvoice.java

@@ -119,6 +119,13 @@
    private String reimburseState;

    /**
     * 报销ID
     */
    @ApiModelProperty("报销ID")
    @Excel(name = "报销ID")
    private String reimburseId;

    /**
     * 扩展内容（json存）
     */
    @ApiModelProperty("扩展内容（json存）")