Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/disputeRecord/mapper/DisputeRecordMapper.xml

@@ -227,9 +227,15 @@
        jdr.address,
        jdr.event_time,
        jdr.name_one,
        case when jdr.gender_one =1 then '男'
        when jdr.gender_one=2 then '女'
        end as gender_one,
        jdr.phone_one,
        jdr.id_card_one,
        jdr.name_two,
        case when jdr.gender_two =1 then '男'
        when jdr.gender_two=2 then '女'
        end as gender_two,
        jdr.phone_two,
        jdr.id_card_two,
        jdr.dispute_type,