Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs

luxiaotao1123

2021-08-25 6cd9f18cd85472b5d7ccc0a6e0f6924da4dbd6e5

 src/main/java/com/zy/common/entity/Parameter.java

@@ -59,4 +59,15 @@
    public void setCodeSwitch(String codeSwitch) {
        this.codeSwitch = codeSwitch;
    }

    // 库位初始化口令
    private String locMastInitPwd;

    public String getLocMastInitPwd() {
        return locMastInitPwd;
    }

    public void setLocMastInitPwd(String locMastInitPwd) {
        this.locMastInitPwd = locMastInitPwd;
    }
}