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

侯瑞军

2020-05-14 293d5042a773595ded45bdc9c69c4555ab9c5dd5

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysUserLogsMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return SysUserLogs对象
     */
    SysUserLogs findByObject(SysUserLogs sysUserLogs);
    SysUserLogs findByObject(@Param("p") SysUserLogs sysUserLogs);
}