Merge branch 'sharding' into test

# Conflicts:
#	src/main/java/com/sqx/SqxApplication.java
#	src/main/java/com/sqx/modules/common/controller/app/AppCommonController.java
#	src/main/resources/mapper/course/CourseDao.xml
This commit is contained in:
2024-12-30 16:30:04 +08:00
41 changed files with 669 additions and 1115 deletions

View File

@@ -1,6 +1,6 @@
package com.sqx.common.utils;
import com.alibaba.druid.util.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;