Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

ruoyi-modules/Property/src/main/resources/mapper/Property/MeetPictureMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.property.mapper.MeetPictureMapper">
+
+</mapper>

ruoyi-modules/Property/src/main/resources/mapper/Property/PlantsPlanProductMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="id" column="pid"/>
        <result property="planId" column="plan_id"/>
        <result property="productId" column="product_id"/>
+       <result property="productNum" column="product_num"/>
        <association property="product" javaType="org.dromara.property.domain.vo.PlantsProductVo">
            <id property="id" column="id"/>
            <result property="plantCode" column="plant_code"/>
@@ -30,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             c.id pid,
             c.plan_id,
             c.product_id,
+            c.product_num,
             p.*
         from plants_plan_product c
         left join plants_product p on c.product_id = p.id