Merge branch 'master' of http://47.97.1.152:5880/r/zy-wcs-master

skyouc

5 天以前 4bf0426314e8eb19b632861603206c4c288647bf

 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;