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

houruijun

2020-09-01 d485902ae91b906ce542e51936bd460f0a3a5b08

 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);
}