fix conflect

wzy

2021-11-11 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d

1
2
 
 <rich-text  class='pd-10'  nodes="{{article.artContent}}" bindtap="tap"></rich-text>