Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-14 d9f7787e24dd9ee4136298bcfd141aed1bb3ed7c

 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>