Merge remote-tracking branch 'origin/master'

linwe

2023-12-19 7b6ad0f09bfc5cd45a1aacfdfe55e69a02b9ff26

 src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml

@@ -55,6 +55,9 @@
                 LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
        WHERE jg.community_code = #{code}
          AND jg.is_deleted = 0
        <if test="userId!=null">
          and jgm.user_id= #{userId}
        </if>
    </select>

    <select id="getCompanyStatistics" resultType="java.lang.Integer">