Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-05-17 8722d2bb39c6c0697647e77a879d14b28d3ef0f5

 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java

@@ -40,20 +40,24 @@
    @Excel(name = "设备名称")
    private String deviceName;

    /** 出入库类型（in /out） */
    @Excel(name = "出入库类型", readConverterExp = "i=n,/=out")
    /** 类型（设备，材料） */
    @Excel(name = "出入库类型", readConverterExp = "类型（设备，材料）")
    private String type;

    /** 出入库时间 */
    @Excel(name = "出入库时间")
    private String transactionDate;
    /** 出库时间 */
    @Excel(name = "出库时间")
    private String outboundDate;

    /** 入库时间 */
    @Excel(name = "入库时间")
    private String inboundDate;

    /** 经办人 */
    @Excel(name = "经办人")
    private String optUser;

    /** 使用人 */
    @Excel(name = "使用人")
    @Excel(name = "负责人")
    private String applyUser;

    /** 出入库数量 */
@@ -130,25 +134,31 @@
        this.type = type;
    }

    public String getType() 
    {
    public String getType() {
        return type;
    }
    public void setTransactionDate(String transactionDate) 
    {
        this.transactionDate = transactionDate;

    public String getOutboundDate() {
        return outboundDate;
    }

    public String getTransactionDate() 
    {
        return transactionDate;
    public void setOutboundDate(String outboundDate) {
        this.outboundDate = outboundDate;
    }
    public void setOptUser(String optUser) 
    {

    public String getInboundDate() {
        return inboundDate;
    }

    public void setInboundDate(String inboundDate) {
        this.inboundDate = inboundDate;
    }

    public void setOptUser(String optUser) {
        this.optUser = optUser;
    }

    public String getOptUser() 
    public String getOptUser()
    {
        return optUser;
    }
@@ -190,8 +200,6 @@
            .append("deviceId", getDeviceId())
            .append("deviceCode", getDeviceCode())
            .append("deviceName", getDeviceName())
            .append("type", getType())
            .append("transactionDate", getTransactionDate())
            .append("optUser", getOptUser())
            .append("applyUser", getApplyUser())
            .append("number", getNumber())