From e8b6e450ffbb6bfb9526df427ff1a53053906449 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 08 六月 2024 22:23:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ahyxasrs' into ahyxasrs
---
src/main/java/com/zy/asrs/entity/WrkMastCrn.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastCrn.java b/src/main/java/com/zy/asrs/entity/WrkMastCrn.java
index db97d0b..77a27da 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastCrn.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastCrn.java
@@ -202,7 +202,7 @@
public WrkMastCrn(WrkMast wrkMast,WrkMast wrkMastOther,Date now) {
this.wrkNo = wrkMast.getWrkNo().longValue();
- this.wrkSts = 2L;
+ this.wrkSts = wrkMast.getWrkSts();
this.ioType = wrkMast.getIoType();
this.crnNo = wrkMast.getCrnNo();
this.locNo = wrkMast.getLocNo();
--
Gitblit v1.9.1