From 5f48e04bf4bc594121d2ef3f768407393f643fe7 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 08 七月 2023 15:14:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java b/igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java
index ea1844f..14259de 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java
@@ -1,6 +1,6 @@
package com.ld.igds.m;
-import com.ld.igds.models.MPlan;
+import com.ld.igds.models.InoutPlan;
import com.ld.igds.util.ContextUtil;
import java.util.List;
@@ -53,7 +53,7 @@
public static final String AUDIT_UNPASS = "UNPASS";
/**
- * 鍚堝悓绫诲瀷-杞崲鍚堝悓
+ * 鍚堝悓绫诲瀷-浠ｅ偍鍚堝悓
*/
public static final String CONTRACT_TYPE_3 = "3";
/**
@@ -79,7 +79,7 @@
*
* @param type
*/
- public static String createPlanId(String type, String year, List<MPlan> list) {
+ public static String createPlanId(String type, String year, List<InoutPlan> list) {
String index = "001";
if(list != null && list.size() > 0){
String[] arr = list.get(0).getId().split("_");
--
Gitblit v1.9.3