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

Junjie

2024-06-12 8a8faba0f55512a2c18c4fe719a1bb0c4f6a86c9

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

@@ -143,6 +143,11 @@
    private Long sendTime = 0L;

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

    /**
     * 设置提升机状态
     */
    public void setProtocolStatus(Integer status) {