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

zss

2 天以前 7f642bd0b97e30ef91ac6d2809d7e4a77d00c7fe

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

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

    @TableField(exist = false)
    private String approveTypeName;

    /**
     * 审批备注
     */