Merge remote-tracking branch 'origin/master'

于杰

2025-07-25 9d80c05bdbc18b4d7778828d411deb9b603f6a4b

 north-glass-erp/src/main/resources/mapper/mm/BasicWarehouseType.xml

@@ -40,6 +40,10 @@
        update mm.basic_warehouse_type set operate_type_name=#{operateTypeName},create_time=now() where id=#{id}
    </update>

    <select id="getBasicWarehouseUser" >
        select user_name from erp_user_info.user u where u.address regexp #{type};
    </select>