diff --git a/eladmin-logging/src/main/java/cn/ysk/cashier/aspect/LogAspect.java b/eladmin-logging/src/main/java/cn/ysk/cashier/aspect/LogAspect.java
index 5d0446e7..5c7bee77 100644
--- a/eladmin-logging/src/main/java/cn/ysk/cashier/aspect/LogAspect.java
+++ b/eladmin-logging/src/main/java/cn/ysk/cashier/aspect/LogAspect.java
@@ -78,12 +78,14 @@ public class LogAspect {
         Object o = redisUtils.get("online-token-"+getToken(request));
         JSONObject jsonObject = null;
         Integer shopId = null;
-        if (o!= null){
+        String nickName = "";
+        if (o != null) {
             String jsonString = JSON.toJSONString(o);
             jsonObject = JSONObject.parseObject(jsonString);
-            shopId = (Integer)jsonObject.get("shopId");
+            shopId = (Integer) jsonObject.get("shopId");
+            nickName = jsonObject.get("nickName") == null ? "" : jsonObject.get("nickName").toString();
         }
-        logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request),joinPoint, log, shopId);
+        logService.save(nickName+":"+getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request),joinPoint, log, shopId);
         return result;
     }
 
@@ -107,9 +109,10 @@ public class LogAspect {
             jsonObject = JSONObject.parseObject(jsonString);
             shopId = (Integer)jsonObject.get("shopId");
         }
-        logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint)joinPoint, log, shopId);
+        logService.save(getUsername()+getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint)joinPoint, log, shopId);
     }
 
+
     public String getUsername() {
         try {
             return SecurityUtils.getCurrentUsername();
@@ -117,6 +120,7 @@ public class LogAspect {
             return "";
         }
     }
+
     public String getToken(HttpServletRequest request) {
         final String requestHeader = request.getHeader("Authorization");
         if (requestHeader != null && requestHeader.startsWith("Bearer")) {
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConCheckController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConCheckController.java
index 106bc4a4..3c48f2db 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConCheckController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConCheckController.java
@@ -34,7 +34,6 @@ public class TbConCheckController {
     }
 
     @GetMapping
-    @Log("查询盘点耗材")
     @ApiOperation("查询盘点耗材")
     public ResponseEntity<Object> queryTbConCheck(TbConCheckQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(tbConCheckService.queryAll(criteria,pageable),HttpStatus.OK);
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConUnitController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConUnitController.java
index 4fef292f..1b572f8c 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConUnitController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConUnitController.java
@@ -37,7 +37,6 @@ public class TbConUnitController {
     }
 
     @GetMapping
-    @Log("查询耗材单位添加")
     @ApiOperation("查询耗材单位添加")
     public ResponseEntity<Object> queryTbConUnit(TbConUnitQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(tbConUnitService.queryAll(criteria,pageable),HttpStatus.OK);
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoController.java
index 01fa4199..7c50ba9a 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoController.java
@@ -41,7 +41,6 @@ public class TbConsInfoController {
     }
 
     @GetMapping
-    @Log("查询耗材信息")
     @ApiOperation("查询耗材信息")
     public ResponseEntity<Object> queryTbConsInfo(TbConsInfoQueryCriteria criteria, Pageable pageable){
         pageable = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), Sort.by("createTime").descending());
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoFlowController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoFlowController.java
index 7be90f0f..64acbc06 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoFlowController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoFlowController.java
@@ -34,7 +34,6 @@ public class TbConsInfoFlowController {
     }
 
     @GetMapping
-    @Log("查询耗材流水")
     @ApiOperation("查询耗材流水")
     public ResponseEntity<Object> queryTbConsInfoFlow(TbConsInfoFlowQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(tbConsInfoFlowService.queryAll(criteria,pageable),HttpStatus.OK);
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsSuppFlowController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsSuppFlowController.java
index c644ce8b..0403ad4b 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsSuppFlowController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsSuppFlowController.java
@@ -34,7 +34,6 @@ public class TbConsSuppFlowController {
     }
 
     @GetMapping
-    @Log("查询入库记录")
     @ApiOperation("查询入库记录")
     public ResponseEntity<Object> queryTbConsSuppFlow(TbConsSuppFlowQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(tbConsSuppFlowService.queryAll(criteria,pageable),HttpStatus.OK);
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsTypeController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsTypeController.java
index 425593e5..5b28b4b1 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsTypeController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsTypeController.java
@@ -35,7 +35,6 @@ public class TbConsTypeController {
     }
 
     @GetMapping
-    @Log("查询耗材类型")
     @ApiOperation("查询耗材类型")
     public ResponseEntity<Object> queryTbConsType(TbConsTypeQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(tbConsTypeService.queryAll(criteria,pageable),HttpStatus.OK);
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java
index 7311119b..c4a46071 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java
@@ -37,7 +37,6 @@ public class TbProskuConController {
     }
 
     @GetMapping
-    @Log("查询商品规格耗材信息")
     @ApiOperation("查询商品规格耗材信息")
     public ResponseEntity<Object> queryTbProskuCon(TbProskuConQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(tbProskuConService.queryAll(criteria,pageable),HttpStatus.OK);
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/ViewConInfoFlowController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/ViewConInfoFlowController.java
index e5558da6..8de657ce 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/ViewConInfoFlowController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/ViewConInfoFlowController.java
@@ -34,7 +34,6 @@ public class ViewConInfoFlowController {
     }
 
     @GetMapping
-    @Log("查询获取耗材流水信息")
     @ApiOperation("查询获取耗材流水信息")
     public ResponseEntity<Object> queryViewConInfoFlow(ViewConInfoFlowQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(viewConInfoFlowService.queryAll(criteria,pageable),HttpStatus.OK);
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/ViewConSkuController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/ViewConSkuController.java
index 276aa1cd..473a08de 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/ViewConSkuController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/ViewConSkuController.java
@@ -34,7 +34,6 @@ public class ViewConSkuController {
     }
 
     @GetMapping
-    @Log("查询查询耗材规格信息")
     @ApiOperation("查询查询耗材规格信息")
     public ResponseEntity<Object> queryViewConSku(ViewConSkuQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(viewConSkuService.queryAll(criteria,pageable),HttpStatus.OK);
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/ViewConsSuppFlowController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/ViewConsSuppFlowController.java
index b1c72be8..2c51372b 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/ViewConsSuppFlowController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/ViewConsSuppFlowController.java
@@ -34,7 +34,6 @@ public class ViewConsSuppFlowController {
     }
 
     @GetMapping
-    @Log("查询出入库记录")
     @ApiOperation("查询出入库记录")
     public ResponseEntity<Object> queryViewConsSuppFlow(ViewConsSuppFlowQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(viewConsSuppFlowService.queryAll(criteria,pageable),HttpStatus.OK);
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/ViewProductSkuShopController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/ViewProductSkuShopController.java
index a3ed039c..862f8f6b 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/ViewProductSkuShopController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/ViewProductSkuShopController.java
@@ -34,7 +34,6 @@ public class ViewProductSkuShopController {
     }
 
     @GetMapping
-    @Log("查询商品规格信息查询")
     @ApiOperation("查询商品规格信息查询")
     public ResponseEntity<Object> queryViewProductSkuShop(ViewProductSkuShopQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(viewProductSkuShopService.queryAll(criteria,pageable),HttpStatus.OK);
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbCouponCategoryController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbCouponCategoryController.java
index a6fc4257..8a33c94a 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbCouponCategoryController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbCouponCategoryController.java
@@ -26,7 +26,6 @@ public class TbCouponCategoryController {
     private final TbCouponCategoryService tbCouponCategoryService;
 
     @GetMapping
-    @Log("查询团购卷类别")
     @ApiOperation("查询团购卷类别")
     public ResponseEntity<Object> queryTbCouponCategory(TbCouponCategoryQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(tbCouponCategoryService.queryAll(criteria,pageable),HttpStatus.OK);
diff --git a/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl b/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl
index 8b863d9f..ada29d7f 100644
--- a/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl
+++ b/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl
@@ -34,7 +34,6 @@ public class ${className}Controller {
     }
 
     @GetMapping
-    @Log("查询${apiAlias}")
     @ApiOperation("查询${apiAlias}")
     public ResponseEntity<Object> query${className}(${className}QueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(${changeClassName}Service.queryAll(criteria,pageable),HttpStatus.OK);