From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
index 97036b6..3e38b31 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
@@ -45,7 +45,7 @@
//������jar���������������
ApplicationHome h = new ApplicationHome(getClass());
//���jar������������������������������upload������������������������������������
- String path = h.getSource().getParentFile().toString() + "/static/img/";
+ String path = h.getSource().getParentFile().toString() + "/static/img";
Map<String, Object> result = new HashMap<>();
@@ -124,7 +124,7 @@
public Map<String, Object> updateSupervision(MultipartFile[] files, Supervision supervision) {
String path = this.getClass().getClassLoader()
- .getResource("").getFile() + "static/img/";
+ .getResource("").getFile() + "static/img";
Map<String, Object> result = new HashMap<>();
@@ -160,4 +160,9 @@
supervisionMapper.updateById(supervision);
return result;
}
+
+ @Override
+ public void deleteSupervision(Integer id) {
+ supervisionMapper.deleteById(id);
+ }
}
--
Gitblit v1.8.0