Merge branch 'pay_master' into dev

bingbing

2020-10-26 34589cd092e0de8cfd704cd59608ed0f36f6093a

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

@@ -10,7 +10,8 @@
         update_time,
         is_del,
         enabled,
         tenant_id
         tenant_id,
         type
   </sql>

   <sql id="where">