Commit 2e5d49dc45cc150ce1be0978872cbb2cfe8d0e70

Authored by boyang
2 parents 9f761915 ece6f305

Merge branch 'master' into dev

src/pages/Order/FeedBack/OrderList.tsx
@@ -2589,7 +2589,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => { @@ -2589,7 +2589,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => {
2589 <span className="text-slate-700"> 2589 <span className="text-slate-700">
2590 {record.institutionContactName 2590 {record.institutionContactName
2591 ? record.institutionContactName + ' ' 2591 ? record.institutionContactName + ' '
2592 - : ''} 2592 + : '企业'}
2593 </span> 2593 </span>
2594 </span> 2594 </span>
2595 </> 2595 </>
src/pages/Order/OrderList/OrderList.tsx
@@ -2631,7 +2631,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; { @@ -2631,7 +2631,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
2631 <span className="text-slate-700"> 2631 <span className="text-slate-700">
2632 {record.institutionContactName 2632 {record.institutionContactName
2633 ? record.institutionContactName + ' ' 2633 ? record.institutionContactName + ' '
2634 - : ''} 2634 + : '企业'}
2635 </span> 2635 </span>
2636 </span> 2636 </span>
2637 </> 2637 </>