Merge branches 'gdwcs' and 'jswcs' of https://gitee.com/luxiaotao1123/zy-wc...

luxiaotao1123

2020-09-08 28a7821e43bd5763739fe67384cfea6693b3500b

 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -41,7 +41,7 @@
    private boolean inreq1;

    // 锁定标记
    private boolean pakMk;
    private boolean pakMk = true;

    public BasDevp toSqlModel(){
        BasDevp basDevp = new BasDevp();