Merge remote-tracking branch 'origin/master'

tangzy

2022-07-16 dbbdbab62839ce6ba271d2144e37ab6b05f42c78

 src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml

@@ -24,6 +24,11 @@
        from sys_stockfactory
        where is_deleted = 0
    </select>
    <select id="selectStockfactoryPages" resultMap="stockfactoryResultMap">
        select *
        from sys_stockfactory
        where is_deleted = 0
    </select>

    <select id="selectStockFa" resultType="java.util.HashMap">
        select id as dictKey, agricultural_name as dictValue