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

maven

2 天以前 be43a6e71f665ce97c9fbf973bf43d24fdb24a54

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

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

    @TableField(exist = false)
    private String approveTypeName;

    /**
     * 审批备注
     */