Merge remote-tracking branch 'origin/pim-jlmy' into pim_ywx

yaowanxin

9 天以前 df35c666ff8342343c82735ee25c5f04ae0d054c

 src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java

@@ -24,4 +24,8 @@
    private String approveTime;

    private Integer approveStatus;
    /**
     * 审批类型
     */
    private Integer approveType;
}