Merge remote-tracking branch 'origin/master'

mrzhssss

2022-03-17 d801ee292fb95592b3ed0eaa95d3b2506c78c9c1

Merge remote-tracking branch 'origin/master'

 src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java

@@ -153,6 +153,12 @@
    private Integer quaStatus;

    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;

    /**
     * 修改人员
     */
    @ApiModelProperty(value= "修改人员")
@@ -387,6 +393,14 @@
        this.quaStatus = quaStatus;
    }

    public String getMemo() {
        return memo;
    }

    public void setMemo(String memo) {
        this.memo = memo;
    }

    public Long getModiUser() {
        return modiUser;
    }

 src/main/resources/mapper/QualityDetlMapper.xml

@@ -21,6 +21,7 @@
        <result column="rejectQty" property="rejectQty" />
        <result column="rejectReason" property="rejectReason" />
        <result column="qua_status" property="quaStatus" />
        <result column="memo" property="memo" />
        <result column="modi_user" property="modiUser" />
        <result column="modi_time" property="modiTime" />
        <result column="appe_user" property="appeUser" />