Merge remote-tracking branch 'origin/master'

Junjie

23 小时以前 a840ef6aa8f89075cbaee87973cdece12e370a28

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

@@ -159,6 +159,11 @@
    private String barcode;

    /**
     * 任务接收
     */
    public Integer taskReceive;

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