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

云

16 小时以前 9683f8f2b526f67bff039a1cd46818808b53ab3e

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

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



    /** 备注 */

    @TableField(exist = false)

    private String remark;



    /** 请求参数 */