Merge branch 'dev'

zhaoxiaohao

2020-11-17 b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml

@@ -112,7 +112,7 @@
            <if test="p.endTime!= null and p.endTime !=''">
                and DE.create_time &lt;= #{p.endTime}
            </if>
            <include refid="com.kidgrow.oprationcenter.mapper.SysProductMapper.Role_Organization"></include>
<!--            <include refid="com.kidgrow.oprationcenter.mapper.SysProductMapper.Role_Organization"></include>-->
        </where>
    </sql>
    <select id="groupProductDetail" resultType="com.kidgrow.oprationcenter.vo.GroupProductDetail">
@@ -261,8 +261,7 @@
   order_id IN ( SELECT id FROM product_order WHERE hospital_id = #{hospitalId} AND department_id = #{departmentId} AND is_del = 0 AND enabled = 1 )
   AND is_del = 0
   AND enabled = 1
ORDER BY
   create_time DESC
ORDER BY id DESC
    </select>
   <select id="getUserdProduct" resultType="int">
        SELECT