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

zss

3 天以前 7a9bd9b7da7c4943e8b5853d4d7de5cba72f3de0

 src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java

@@ -131,6 +131,9 @@
     */
    private Integer approveType;

    @TableField(exist = false)
    private String approveTypeName;

    /**
     * 审批备注
     */