Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-26 b4f51073e4a5ac0fc14a2087af339cd39e267f0d

 cloud-server-management/src/main/resources/mapper/PushOrderMapper.xml

@@ -14,7 +14,7 @@
    </resultMap>


    <select id="querys" resultType="PushOrder">
    <select id="querys" resultType="com.dsh.course.entity.PushOrder">
        select
        id as id,
        companyId as companyId,