Merge branch 'pay_master' into dev

bingbing

2020-10-26 34589cd092e0de8cfd704cd59608ed0f36f6093a

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysCompanyMapper.xml

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

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