Merge branch 'pay_master' into dev

bingbing

2020-10-26 34589cd092e0de8cfd704cd59608ed0f36f6093a

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

@@ -4,7 +4,7 @@
<mapper namespace="com.kidgrow.oprationcenter.mapper.SysProductMapper">
    <!--定义查询列-->
    <sql id="Column_List">
      *
     DISTINCT *
   </sql>
    <!--定义数据权限的查询-->
    <sql id="Role_Organization">
@@ -123,4 +123,12 @@
        <include refid="where"/>
        order by id desc
    </select>
    <!--定义根据-SysProduct当作查询条件返回对象集合-->
    <select id="findAllList" resultType="com.kidgrow.oprationcenter.vo.ProductAllVo">
        select
        <include refid="Column_List"/>
        from sys_product
        <include refid="where"/>
        order by id desc
    </select>
</mapper>