Merge branch 'main' into dev_wjm_infer

jmwang66

2023-06-16 7375292887752a995cef6f77f3d837db67c981a4

 funasr/models/encoder/opennmt_encoders/conv_encoder.py

@@ -67,7 +67,7 @@

class ConvEncoder(AbsEncoder):
    """
    author: Speech Lab, Alibaba Group, China
    Author: Speech Lab of DAMO Academy, Alibaba Group
    Convolution encoder in OpenNMT framework
    """