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

cl

2 天以前 f95a3c836f06078f41389051a9d1c01969a925cb

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

@@ -193,6 +193,11 @@
    private Integer crnLane = 1;

    /**
     * 日志采集时间
     */
    private Long deviceDataLog = System.currentTimeMillis();

    /**
     * 上一次指令下发时间
     */
    private Long lastCommandTime = System.currentTimeMillis();