BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 067ff6cc4dd8ce680cc38ba9da811ed93c289c48

Authored by YunaiV
1 parent d134bfc4

✨ bugfix master 的一些 pr

Inline Side-by-side
Showing 4 changed files with 8 additions and 8 deletions
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/comment/ProductCommentMapper.java
  View file @067ff6c
@@ -25,19 +25,18 @@ public interface ProductCommentMapper extends BaseMapperX<ProductCommentDO> { @@ -25,19 +25,18 @@ public interface ProductCommentMapper extends BaseMapperX<ProductCommentDO> {
25 } 25 }
26 26
27 static void appendTabQuery(LambdaQueryWrapperX<ProductCommentDO> queryWrapper, Integer type) { 27 static void appendTabQuery(LambdaQueryWrapperX<ProductCommentDO> queryWrapper, Integer type) {
28 - LambdaQueryWrapperX<ProductCommentDO> queryWrapperX = new LambdaQueryWrapperX<>();  
29 // 构建好评查询语句：好评计算 总评 >= 4 28 // 构建好评查询语句：好评计算 总评 >= 4
30 if (ObjectUtil.equal(type, AppCommentPageReqVO.GOOD_COMMENT)) { 29 if (ObjectUtil.equal(type, AppCommentPageReqVO.GOOD_COMMENT)) {
31 - queryWrapperX.ge(ProductCommentDO::getScores, 4); 30 + queryWrapper.ge(ProductCommentDO::getScores, 4);
32 } 31 }
33 // 构建中评查询语句：中评计算 总评 >= 3 且 总评 < 4 32 // 构建中评查询语句：中评计算 总评 >= 3 且 总评 < 4
34 if (ObjectUtil.equal(type, AppCommentPageReqVO.MEDIOCRE_COMMENT)) { 33 if (ObjectUtil.equal(type, AppCommentPageReqVO.MEDIOCRE_COMMENT)) {
35 - queryWrapperX.ge(ProductCommentDO::getScores, 3);  
36 - queryWrapperX.lt(ProductCommentDO::getScores, 4); 34 + queryWrapper.ge(ProductCommentDO::getScores, 3);
  35 + queryWrapper.lt(ProductCommentDO::getScores, 4);
37 } 36 }
38 // 构建差评查询语句：差评计算 总评 < 3 37 // 构建差评查询语句：差评计算 总评 < 3
39 if (ObjectUtil.equal(type, AppCommentPageReqVO.NEGATIVE_COMMENT)) { 38 if (ObjectUtil.equal(type, AppCommentPageReqVO.NEGATIVE_COMMENT)) {
40 - queryWrapperX.lt(ProductCommentDO::getScores, 3); 39 + queryWrapper.lt(ProductCommentDO::getScores, 3);
41 } 40 }
42 } 41 }
43 42
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
  View file @067ff6c
@@ -50,7 +50,7 @@ public class MenuController { @@ -50,7 +50,7 @@ public class MenuController {
50 50
51 @DeleteMapping("/delete") 51 @DeleteMapping("/delete")
52 @Operation(summary = "删除菜单") 52 @Operation(summary = "删除菜单")
53 - @Parameter(name = "id", description = "角色编号", required= true, example = "1024") 53 + @Parameter(name = "id", description = "菜单编号", required= true, example = "1024")
54 @PreAuthorize("@ss.hasPermission('system:menu:delete')") 54 @PreAuthorize("@ss.hasPermission('system:menu:delete')")
55 public CommonResult<Boolean> deleteMenu(@RequestParam("id") Long id) { 55 public CommonResult<Boolean> deleteMenu(@RequestParam("id") Long id) {
56 menuService.deleteMenu(id); 56 menuService.deleteMenu(id);
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java
  View file @067ff6c
@@ -25,6 +25,7 @@ public class RoleRespVO { @@ -25,6 +25,7 @@ public class RoleRespVO {
25 @ExcelProperty("角色名称") 25 @ExcelProperty("角色名称")
26 private String name; 26 private String name;
27 27
  28 + @Schema(description = "角色标志", requiredMode = Schema.RequiredMode.REQUIRED, example = "admin")
28 @NotBlank(message = "角色标志不能为空") 29 @NotBlank(message = "角色标志不能为空")
29 @ExcelProperty("角色标志") 30 @ExcelProperty("角色标志")
30 private String code; 31 private String code;
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/redis/RedisKeyConstants.java
  View file @067ff6c
@@ -52,7 +52,7 @@ public interface RedisKeyConstants { @@ -52,7 +52,7 @@ public interface RedisKeyConstants {
52 /** 52 /**
53 * OAuth2 客户端的缓存 53 * OAuth2 客户端的缓存
54 * <p> 54 * <p>
55 - * KEY 格式：user:{id} 55 + * KEY 格式：oauth_client:{id}
56 * VALUE 数据类型：String 客户端信息 56 * VALUE 数据类型：String 客户端信息
57 */ 57 */
58 String OAUTH_CLIENT = "oauth_client"; 58 String OAUTH_CLIENT = "oauth_client";
@@ -78,7 +78,7 @@ public interface RedisKeyConstants { @@ -78,7 +78,7 @@ public interface RedisKeyConstants {
78 /** 78 /**
79 * 邮件账号的缓存 79 * 邮件账号的缓存
80 * <p> 80 * <p>
81 - * KEY 格式：sms_template:{id} 81 + * KEY 格式：mail_account:{id}
82 * VALUE 数据格式：String 账号信息 82 * VALUE 数据格式：String 账号信息
83 */ 83 */
84 String MAIL_ACCOUNT = "mail_account"; 84 String MAIL_ACCOUNT = "mail_account";