From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/recordk/controller/RecordkController.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
index 833fbbe..d46c82f 100644
--- a/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
+++ b/src/main/java/org/springblade/modules/recordk/controller/RecordkController.java
@@ -97,8 +97,10 @@
String id = map.get("id").toString();
recordkService.removeByIds(Func.toLongList(id));
}
+ recordk.setStorage("1");
recordk.setType("2");
recordk.setPtype("3");
+ recordk.setPermitime(new Date());
return R.status(recordkService.save(recordk));
}
@@ -154,4 +156,10 @@
}
+ @PostMapping("/selectIn")
+ public R selectIn(String cardid) {
+ Map map = recordkService.selectIn(cardid);
+ return R.data(map);
+ }
+
}
--
Gitblit v1.9.3