Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-26 30f6da8bf0143906b42fa600f6a604cea6c81f71

 standard-server/src/main/resources/mapper/MaterialMapper.xml

@@ -7,7 +7,7 @@
        from material
        where state = 1
        order by create_time desc
        limit #{num1},#{num2}
            limit #{num1},#{num2}
    </select>
    <select id="selectMaterialById" resultType="java.util.Map">
        select m.id,