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

xuhy

昨天 3b6789ae8cb8138533b2cc362f37ad94b605a58d

 ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml

@@ -330,6 +330,7 @@
                AND ot.companyId = #{nowUserId}
            </if>
        and ot.isException = 1
        AND ot.updatePrice IS NOT NULL
        </where>
        order by ot.id desc
    </select>