Merge remote-tracking branch 'origin/dev' into dev

zhaoxiaohao

2020-04-10 eab02ab1453dc1f1e9933077dde1cef67d798936

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

@@ -16,7 +16,7 @@
                and id = #{p.id}
            </if>
            <if test="p.proName != null and p.proName !=''">
                and pro_name = #{p.proName}
                and pro_name like concat('%', #{p.proName}, '%')
            </if>
            <if test="p.proTime != null and p.proTime !=''">
                and pro_time = #{p.proTime}