Merge branch 'pay_master' of ssh://192.168.2.240:29418/kidgrow-microservice...

zhaoxiaohao

2020-09-29 5a4040ba6977febaff8d73e4ed27fefaceb24167

 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">