Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

jenkins

10 天以前 37e8d3271fdc473ab9f756a3445f595d3babeab7

 src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java

@@ -39,6 +39,7 @@
    private Date updateTime;



    /** 备注 */

    @TableField(exist = false)

    private String remark;



    /** 请求参数 */