lianghanqiang преди 4 години
родител
ревизия
91e2c90d98

+ 9 - 9
src/main/java/org/springblade/ldt/account/controller/AccountController.java

@@ -62,11 +62,11 @@ public class AccountController extends BladeController {
 	}
 
 	/**
-	 * 分页
+	 * 分页 
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入account ")
+	@ApiOperation(value = "分页", notes = "传入account")
 	public R<IPage<AccountVO>> list(Account account, Query query) {
 		IPage<Account> pages = accountService.page(Condition.getPage(query), Condition.getQueryWrapper(account));
 		return R.data(AccountWrapper.build().pageVO(pages));
@@ -74,7 +74,7 @@ public class AccountController extends BladeController {
 
 
 	/**
-	 * 自定义分页
+	 * 自定义分页 
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -85,7 +85,7 @@ public class AccountController extends BladeController {
 	}
 
 	/**
-	 * 新增
+	 * 新增 
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -95,7 +95,7 @@ public class AccountController extends BladeController {
 	}
 
 	/**
-	 * 修改
+	 * 修改 
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -105,7 +105,7 @@ public class AccountController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改
+	 * 新增或修改 
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -114,9 +114,9 @@ public class AccountController extends BladeController {
 		return R.status(accountService.saveOrUpdate(account));
 	}
 
-
+	
 	/**
-	 * 删除
+	 * 删除 
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
@@ -125,5 +125,5 @@ public class AccountController extends BladeController {
 		return R.status(accountService.deleteLogic(Func.toLongList(ids)));
 	}
 
-
+	
 }

+ 1 - 1
src/main/java/org/springblade/ldt/shop/entity/Audit.java

@@ -91,7 +91,7 @@ public class Audit extends BaseEntity {
 	* 商户名称
 	*/
 		@ApiModelProperty(value = "商户名称")
-		private Long shopName;
+		private String shopName;
 	/**
 	* 商户logo
 	*/

+ 1 - 1
src/main/resources/application-dev.yml

@@ -38,7 +38,7 @@ social:
 blade:
   secure:
     skip-url:
-      /**
+#      /**
   #分布式锁配置
   lock:
     ##是否启用分布式锁