Merge branch 'feature_v2.1_converse' of gitlab.infra.miyatech.com:jiangjiantao/miyafastcashier into feature_v2.1_converse