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

1

5 天以前 ccdcd79a48aabb15d9ce9525a3535c01e69475c8

 src/main/java/com/zy/core/CrnThread.java

@@ -8,10 +8,10 @@

    void setResetFlag(boolean flag);

//    void setBackHpFlag(boolean flag);
    void setBackHpFlag(boolean flag);

    /**
     * 堆垛机是否在回原点运动中标记
     */
//    boolean isBackHpFlag();
    boolean isBackHpFlag();
}