Merge remote-tracking branch 'origin/master'

YYC

2023-06-30 8bba7f03df59c7689dbb64a952a63944a1f43ade

 igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml

@@ -135,7 +135,7 @@
      <PropertyDef name="price">
        <Property name="dataType">Double</Property>
        <Property name="label">单价</Property>
        <Property name="displayFormat">#,###0.000 元/公斤</Property>
        <Property name="displayFormat">#,###0.000 元/吨</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="money">