Merge branch 'sharding-分库' into test

# Conflicts:
#	src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java
#	src/main/java/com/sqx/modules/pay/dao/CashOutDao.java
#	src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java
#	src/main/resources/mapper/course/CourseCollectDao.xml
This commit is contained in:
GYJ
2025-01-02 21:48:53 +08:00
75 changed files with 1248 additions and 964 deletions

View File

@@ -249,7 +249,7 @@
WHERE
c.is_delete = 0 and c.status=1
<if test='null != title'>
and c.title LIKE #{title}
and c.title LIKE concat("%",#{title},"%")
</if>
order by create_time desc
</select>