Merge remote-tracking branch 'remotes/origin/cy' into sy

cloud-market-common/src/main/java/com/muyu/market/domian/Connector.java

@@ -10,13 +10,17 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+/**
+ 接口列表
+ */
+
 @Data
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = "rule", autoResultMap = true)
-public class Connertor extends BaseEntity {
+@TableName(value = "connector", autoResultMap = true)
+public class Connector extends BaseEntity {
 
     /**
      * 主键

cloud-market-common/src/main/java/com/muyu/market/domian/Logs.java

@@ -12,12 +12,15 @@ import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
 
+/**
+ * 日志
+ */
 @Data
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = "rule", autoResultMap = true)
+@TableName(value = "logs", autoResultMap = true)
 public class Logs extends BaseEntity {
 
     /**

cloud-market-common/src/main/java/com/muyu/market/domian/Pay.java

@@ -12,6 +12,9 @@ import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
 
+/***
+ * 支付表
+ */
 @Data
 @SuperBuilder
 @NoArgsConstructor

cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java

@@ -1,11 +1,13 @@
 package com.muyu.master.controller;
 
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.security.annotation.RequiresPermissions;
 import com.muyu.market.domian.Defined;
 import com.muyu.master.service.DefinedService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -24,6 +26,7 @@ import java.util.List;
 
 @Log4j2
 @RestController
+@RequiresPermissions("master:master:list")
 @RequestMapping("/master")
 @Tag(name = "定义接口控制层",description = "进行客户管理，查看等相关操作")
 public class DefinedController {