Merge remote-tracking branch 'origin/dev_2.5_optimize_250306' into dev_2.5_optimize_250306

dev_2.5_optimize_250306
wangwei 4 months ago
commit 5d3238640b

@ -499,8 +499,6 @@ public class IoCodeTempController extends BaseController {
} }
//前端扫码提交(耗材器械) //前端扫码提交(耗材器械)
@RepeatSubmit() @RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@ -1832,8 +1830,6 @@ public class IoCodeTempController extends BaseController {
} }
public Integer getMaxGroupNumber() { public Integer getMaxGroupNumber() {
Integer groupNumber = codeTempService.selectMaxGroupNumber(); Integer groupNumber = codeTempService.selectMaxGroupNumber();
return groupNumber; return groupNumber;

@ -5476,3 +5476,14 @@ CREATE TABLE IF NOT EXISTS `yb_not_code` (
`notCodeType` tinyint DEFAULT NULL COMMENT '无码类型 0、默认不是无码类型1、部分早期未赋予追溯码5、最小包装无追溯码6、无追溯码7、其他原因', `notCodeType` tinyint DEFAULT NULL COMMENT '无码类型 0、默认不是无码类型1、部分早期未赋予追溯码5、最小包装无追溯码6、无追溯码7、其他原因',
PRIMARY KEY (`ybbm`) PRIMARY KEY (`ybbm`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='医保无码信息表'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='医保无码信息表';
CREATE TABLE IF NOT EXISTS `io_collect_set_bustype` (
`id` int NOT NULL AUTO_INCREMENT,
`setCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
`busType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
`updateTime` datetime NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '自动设置单据类型配置' ROW_FORMAT = Dynamic;

Loading…
Cancel
Save