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

lyfO_o

2021-06-11 e1454a154718e20abbab36d0def4de9124a07254

 src/main/java/com/nanometer/smartlab/entity/SysWarehouseContainer.java

@@ -26,6 +26,8 @@
    private String characterLeft;
    private String characterRight;
    private String controllerCode;
    private String controllerName;



    public String getId() {
@@ -147,4 +149,12 @@
    public void setControllerCode(String controllerCode) {
        this.controllerCode = controllerCode;
    }

    public String getControllerName() {
        return controllerName;
    }

    public void setControllerName(String controllerName) {
        this.controllerName = controllerName;
    }
}