合并代码，解决冲突

zhangchao

2024-11-04 c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9

 src/main/java/com/zy/asrs/entity/FlowLog.java

@@ -262,6 +262,8 @@
            otp = "取消移库";
        } else if (this.opType == 9L) {
            otp = "取消调拨";
        } else if (this.opType == 101L) {
            otp = "101.入库";
        }
        return otp;
    }