Merge remote-tracking branch 'origin/master'

huanghongfa

2021-07-07 ad723be9b0bd0977619caf5ce31b91d04116c70e

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -412,4 +412,7 @@
            "</script>")
    void passResetUser(@Param("gridMemberDTO") EventGridMemberPassResetDTO gridMemberDTO);

//    @Update("update lc_compare_code_member set local_grid_member_id = #{userId},grid_member_name = #{userName} where id = #{lcMemberId}")
//    void addLcMember(@Param("lcMemberId") Long lcMemberId,@Param("userId") Long userId,@Param("userName") Long userName);

}