Merge remote-tracking branch 'origin/master'

zhangherong

5 天以前 6722e123b7a54dcc6c6937bc4324c67293f233db

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderQuery.java

@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.request;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,15 @@
    private static final long serialVersionUID = 7710893031748864058L;



    //列表展示
    @TableField(exist = false)
    private String equipmentCode;
    @TableField(exist = false)
    private String equipmentName;
    @TableField(exist = false)
    private String keyword;
    @TableField(exist = false)
    private String equipmentModel;
    private String column;
    private String order;
}