Merge remote-tracking branch 'origin/dev' into dev

Makefile

@@ -2,7 +2,7 @@ merge:
 	git checkout master;git merge dev;git push;git checkout dev;
 
 create-tag:
-	git checkout master;git tag v1.1.7;git push origin --tags;git checkout dev;
+	git checkout master;git tag v1.1.8;git push origin --tags;git checkout dev;
 
 remove-tag:
 	git tag -d v1.0.1;git push origin :refs/tags/v1.0.1;

src/main/java/com/xjrsoft/module/system/controller/MenuController.java

@@ -156,9 +156,9 @@ public class MenuController {
     @ApiOperation(value = "新增菜单")
     @Transactional(rollbackFor = Exception.class)
     public R add(@Valid @RequestBody AddMenuDto dto) {
-        long count = menuService.count(Wrappers.<Menu>query().lambda().eq(Menu::getName, dto.getName()).or().eq(Menu::getCode, dto.getCode()));
+        long count = menuService.count(Wrappers.<Menu>query().lambda().eq(Menu::getCode, dto.getCode()));
         if (count > 0) {
-            return R.error("菜单名或者菜单编码已经存在！");
+            return R.error("菜单编码已经存在！");
         }
         Menu menu = BeanUtil.toBean(dto, Menu.class);
 

src/main/resources/sqlScript/20231113_sql.sql

@@ -113,18 +113,18 @@ CREATE TABLE base_punishment_student_relation
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生处分信息-关联学生';
 
-ALTER TABLE `tl`.`base_punishment_student_relation`   
+ALTER TABLE `base_punishment_student_relation`
   ADD COLUMN `adjust_type` INT NULL   COMMENT '调整类型 1:升级 2:降级 3:撤销' AFTER `major`,
   ADD COLUMN `adjust_date` DATE NULL   COMMENT '调整日期' AFTER `adjust_type`,
   ADD COLUMN `adjust_reason` VARCHAR(500) NULL   COMMENT '调整原因' AFTER `adjust_date`;
 
-ALTER TABLE `tl`.`base_punishment_student_relation`
+ALTER TABLE `base_punishment_student_relation`
   CHANGE `class` `className` VARCHAR(50) CHARSET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL   COMMENT '所在班级';
 
-ALTER TABLE `tl`.`base_punishment_student_relation`
+ALTER TABLE `base_punishment_student_relation`
   ADD COLUMN `modify_user_id` INT NULL   COMMENT '修改人' AFTER `adjust_date`,
   ADD COLUMN `modify_date` datetime NULL   COMMENT '修改时间' AFTER `modify_user_id`;
-ALTER TABLE `tl`.`base_student_punishment_info`
+ALTER TABLE `base_student_punishment_info`
   CHANGE `class_id` `class_id` BIGINT NULL   COMMENT '班级id';
 
 --------------------------------------------------------------------学生考核--------------------------------------------------------------------