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

lidongdong

2022-10-14 c9966fee7d912960b95b5e68ca20682546df0beb

 flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml

@@ -122,7 +122,7 @@
    <select id="selectBySubmitId"  resultMap="GuideRepairOrderResult">
        <include refid="selectGuideRepairOrderVo"/>
        where submit_user_id=#{id} and ( state not in (3,5)  or ( state  in (3,5) and 60>datediff(now(),create_time)
        ))
        )) order by create_time desc 
    </select>