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/SysDictionariesMapper.java

@@ -30,5 +30,7 @@
     * @param
     * @return SysDictionaries对象
     */
    SysDictionaries findByObject(SysDictionaries sysDictionaries);
    SysDictionaries findByObject(@Param("p") SysDictionaries sysDictionaries);

    List<SysDictionaries> findAll(@Param("p") Map<String, Object> params);
}