Merge branch 'driver'

This commit is contained in:
Lx 2025-07-11 17:43:38 +08:00
commit 2f1d91beff
2 changed files with 2 additions and 2 deletions

View File

@ -56,7 +56,7 @@
order by studentTotalNum desc
</select>
<select id="getCoachByUniqueCode" parameterType="String" resultType="cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoach">
<select id="getCoachByUniqueCode" parameterType="string" resultType="cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoach">
SELECT dsc.* FROM company_staff cs
LEFT JOIN drive_school_coach dsc ON cs.user_id = dsc.user_id
WHERE cs.unique_code = #{uniqueCode} AND dsc.DELETED = 0

View File

@ -56,7 +56,7 @@
AND main.discount &gt; 0
</when>
<when test="entity.discountIndex == 0">
AND main.discount = 0 or main.discount is null
AND (main.discount = 0 or main.discount IS NULL)
</when>
</choose>
</if>