Merge remote-tracking branch 'origin/master'

Junjie

2 天以前 2ed2c79a60bea2e05272f11324a0fd148414ae43

 src/main/java/com/zy/core/network/entity/ZyCrnStatusEntity.java

@@ -114,6 +114,11 @@
     */
    public Double yDuration;

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

    private Integer temp1;

    private Integer temp2;