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

liyong

7 天以前 04dce61c02c10832665cdaf1aabf5b7e9b31da47

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

@@ -24,7 +24,7 @@
@ApiModel
public class ApproveProcess{
    /**
     * 
     *
     */
    @TableId(type = IdType.AUTO)
    private Long id;
@@ -168,4 +168,4 @@
    private static final long serialVersionUID = 1L;


}
}