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

zhaoxiaohao

2020-08-08 4d9483cecdeb9e13a7ea4475121351b02058a51b

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

@@ -4,7 +4,7 @@
<mapper namespace="com.kidgrow.oprationcenter.mapper.ProductOrderRecordMapper">
    <!--定义查询列-->
    <sql id="Column_List">
      *
     DISTINCT *
   </sql>

    <!--sql查询片段-->