Merge remote-tracking branch 'origin/dev' into remove_uniapp

lib/settlement/settlement_view/settlement_order_commodity.dart

@@ -354,6 +354,7 @@ class _SettlementOrderCommodity extends State<SettlementOrderCommodity> {
           SizedBox(
             width: 15.w,
           ),
+
           Container(
             child: Text(
               S.of(context).jiesuanjine,