Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

 src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml

@@ -57,7 +57,7 @@
                and jpp.ethnicity != 1
            </if>
            <if test="placePractitioner.type == 3">
                and (((YEAR(CURDATE()) - YEAR(jpp.birthday)) &lt; 18) or ( jpp.ethnicity != 1))
                and (CURDATE() &lt; DATE_ADD( birthday, INTERVAL 18 YEAR ) or ( jpp.ethnicity != 1))
                and jc.category_no in (180202,180201)
            </if>
            and jpp.is_deleted = 0
@@ -111,7 +111,7 @@
        jczz_place_practitioner
        <where>
            <if test="type == 1">
                and (YEAR(CURDATE()) - YEAR(birthday)) &lt; 18
                and CURDATE() &lt; DATE_ADD( birthday, INTERVAL 18 YEAR )
            </if>
            <if test="type == 2">
                and ethnicity != 1