Merge branch 'fix-220418' into 'v2-220418'

src/locales/zh-CN/shop.ts

@@ -101,7 +101,7 @@ export default {
   'channel.member.relieve': '解除绑定关系',
   'channel.member.relieve.batch': '批量解除绑定关系',
   'channel.member.select': '请先选择业务员',
-  'channel.member.wait.bind.select': '选择待绑定会员',
+  'channel.member.wait.bind.select': '选择待绑定下级会员',
   'channel.form.salesman': '业务员',
   'channel.modal.member.select': '选择渠道会员',
   'channel.form.name.placeholder': '输入姓名',

src/pages/transaction/components/card/index.tsx

@@ -10,9 +10,10 @@ export interface CardType {
   extra?: React.ReactNode,
   /** 背景颜色 */
   backgroundColor?: string,
+  children?: JSX.Element
 }
 
-const Card: React.FC<CardType> = (props: any) => {
+const Card: React.FC<CardType> = (props: CardType) => {
   const { id, title, extra, children, backgroundColor } = props;
   return (
     <div id={id} className='ant-card ant-card-bordered' style={{ overflow: 'hidden' }}>

src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/components/tradeTerms.tsx

@@ -144,7 +144,7 @@ const TradeTermsLayout: React.FC<TradeTermsLayoutProps> = (props: any) => {
               format="YYYY-MM-DD"
             />
           </Form.Item>
-          <Form.Item label={intl.formatMessage({ id: 'dealAbility.jiaofudizhi' })} className={style.address_style}>
+          <Form.Item required label={intl.formatMessage({ id: 'dealAbility.jiaofudizhi' })} className={style.address_style}>
             <AddressSelect
               echo={isDefault}
               value={isDefault ? fullAddress.fullAddress : address}