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

liyong

13 小时以前 1cf91e355038837f30f2d727507b2229263d7de7

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

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

    @TableField(exist = false)
    private String approveTypeName;

    /**
     * 审批备注
     */