Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-10 9e3ba891ab4439760d33ff5c12b7405273d0ed95

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

@@ -116,7 +116,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 create_time>sysdate()-60
        where submit_user_id=#{id} and ( state not in (3,5)  or ( state  in (3,5) and 60>datediff(now(),create_time)
        ))
    </select>