From 9cbf815e454c7f2854200a4c4d4712f51958654f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 10 May 2020 22:40:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
erp_web/home.html | 4 ++--
erp_web/login.html | 13 ++++---------
erp_web/register.html | 13 ++++---------
.../com/jsh/erp/controller/FunctionsController.java | 2 +-
.../com/jsh/erp/controller/InOutItemController.java | 2 +-
.../erp/controller/MaterialCategoryController.java | 2 +-
.../com/jsh/erp/controller/MaterialController.java | 2 +-
.../java/com/jsh/erp/controller/MsgController.java | 2 +-
.../java/com/jsh/erp/controller/RoleController.java | 2 +-
.../jsh/erp/controller/SystemConfigController.java | 10 ++--------
.../jsh/erp/controller/UserBusinessController.java | 2 +-
11 files changed, 19 insertions(+), 35 deletions(-)
diff --git a/erp_web/home.html b/erp_web/home.html
index d1dff68f..71392ec9 100644
--- a/erp_web/home.html
+++ b/erp_web/home.html
@@ -7,7 +7,7 @@
- 首页-华夏ERP
+ 华夏ERP
@@ -87,7 +87,7 @@
diff --git a/erp_web/login.html b/erp_web/login.html
index 22d22e18..8072a728 100644
--- a/erp_web/login.html
+++ b/erp_web/login.html
@@ -8,9 +8,9 @@
- 华夏ERP
+
-
+
@@ -79,13 +79,8 @@
diff --git a/erp_web/register.html b/erp_web/register.html
index d7eb15c4..da3cd077 100644
--- a/erp_web/register.html
+++ b/erp_web/register.html
@@ -8,9 +8,9 @@
- 注册 - 华夏ERP
+ 华夏ERP
-
+
@@ -93,13 +93,8 @@
diff --git a/src/main/java/com/jsh/erp/controller/FunctionsController.java b/src/main/java/com/jsh/erp/controller/FunctionsController.java
index 2a146c57..ecf6ed23 100644
--- a/src/main/java/com/jsh/erp/controller/FunctionsController.java
+++ b/src/main/java/com/jsh/erp/controller/FunctionsController.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
/**
- * @author ji-sheng-hua 华夏ERP
+ * @author ji-sheng-hua jshERP
*/
@RestController
@RequestMapping(value = "/functions")
diff --git a/src/main/java/com/jsh/erp/controller/InOutItemController.java b/src/main/java/com/jsh/erp/controller/InOutItemController.java
index 62f76885..642db3e5 100644
--- a/src/main/java/com/jsh/erp/controller/InOutItemController.java
+++ b/src/main/java/com/jsh/erp/controller/InOutItemController.java
@@ -19,7 +19,7 @@ import java.util.List;
import java.util.Map;
/**
- * @author jishenghua 华夏ERP 2018年12月25日14:38:08
+ * @author jishenghua jshERP 2018年12月25日14:38:08
*/
@RestController
@RequestMapping(value = "/inOutItem")
diff --git a/src/main/java/com/jsh/erp/controller/MaterialCategoryController.java b/src/main/java/com/jsh/erp/controller/MaterialCategoryController.java
index 6e0de93f..507e3932 100644
--- a/src/main/java/com/jsh/erp/controller/MaterialCategoryController.java
+++ b/src/main/java/com/jsh/erp/controller/MaterialCategoryController.java
@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
- * @author ji—sheng—hua 华夏ERP
+ * @author ji—sheng—hua jshERP
*/
@RestController
@RequestMapping(value = "/materialCategory")
diff --git a/src/main/java/com/jsh/erp/controller/MaterialController.java b/src/main/java/com/jsh/erp/controller/MaterialController.java
index 074b4a80..511afcd6 100644
--- a/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -29,7 +29,7 @@ import java.util.*;
import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
/**
- * @author ji|sheng|hua 华夏ERP
+ * @author ji|sheng|hua jshERP
*/
@RestController
@RequestMapping(value = "/material")
diff --git a/src/main/java/com/jsh/erp/controller/MsgController.java b/src/main/java/com/jsh/erp/controller/MsgController.java
index 28785db1..5574ea9d 100644
--- a/src/main/java/com/jsh/erp/controller/MsgController.java
+++ b/src/main/java/com/jsh/erp/controller/MsgController.java
@@ -14,7 +14,7 @@ import java.util.List;
import java.util.Map;
/**
- * @author ji sheng hua 华夏ERP
+ * @author ji sheng hua jshERP
*/
@RestController
@RequestMapping(value = "/msg")
diff --git a/src/main/java/com/jsh/erp/controller/RoleController.java b/src/main/java/com/jsh/erp/controller/RoleController.java
index df049631..942e3494 100644
--- a/src/main/java/com/jsh/erp/controller/RoleController.java
+++ b/src/main/java/com/jsh/erp/controller/RoleController.java
@@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
- * @author ji sheng hua 华夏ERP
+ * @author ji sheng hua jshERP
*/
@RestController
@RequestMapping(value = "/role")
diff --git a/src/main/java/com/jsh/erp/controller/SystemConfigController.java b/src/main/java/com/jsh/erp/controller/SystemConfigController.java
index 06e456e9..d11c1cb8 100644
--- a/src/main/java/com/jsh/erp/controller/SystemConfigController.java
+++ b/src/main/java/com/jsh/erp/controller/SystemConfigController.java
@@ -14,8 +14,7 @@ import javax.annotation.Resource;
/**
* Description
- *
- * @Author: qiankunpingtai
+ * @Author: jishenghua
* @Date: 2019/4/1 15:28
*/
@RestController
@@ -24,14 +23,9 @@ public class SystemConfigController {
private Logger logger = LoggerFactory.getLogger(SystemConfigController.class);
@Resource
private SystemConfigService systemConfigService;
+
/**
- * create by: qiankunpingtai
- * website：https://qiankunpingtai.cn
- * description:
* 批量删除系统配置信息
- * create time: 2019/3/29 11:15
- * @Param: ids
- * @return java.lang.Object
*/
@RequestMapping(value = "/batchDeleteSystemConfigByIds")
public Object batchDeleteSystemConfigByIds(@RequestParam("ids") String ids) throws Exception {
diff --git a/src/main/java/com/jsh/erp/controller/UserBusinessController.java b/src/main/java/com/jsh/erp/controller/UserBusinessController.java
index 155a6aa3..f2ef267c 100644
--- a/src/main/java/com/jsh/erp/controller/UserBusinessController.java
+++ b/src/main/java/com/jsh/erp/controller/UserBusinessController.java
@@ -21,7 +21,7 @@ import java.util.Map;
import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
/**
- * @author ji_sheng_hua 华夏ERP
+ * @author ji_sheng_hua jshERP
*/
@RestController
@RequestMapping(value = "/userBusiness")
-
+ © 2015-2030 华夏ERP - Powered By
+ 官方网站