Merge remote-tracking branch 'origin/master'

mitao

7 小时以前 95d8e5f4348497b1eee5884086534c86b1661b4f

 ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml

@@ -137,7 +137,7 @@
            AND t2.category = #{query.category}
        </if>
        <if test="query.assetTypeIdSecond != null and query.assetTypeIdSecond!=''">
            AND t2.asset_type_id = #{query.category}
            AND t2.asset_type_id = #{query.assetTypeIdSecond}
        </if>

        <if test="query.assetStatus != null and query.assetStatus!=''">