Merge remote-tracking branch 'origin/master'

CZT

2023-10-24 f27f3ea5055888f7f1c797d0fd7fb26a2013c89c

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

@@ -41,13 +41,15 @@
      </PropertyDef>
      <PropertyDef name="startTime">
        <Property></Property>
        <Property name="label">有效开始时间</Property>
        <Property name="dataType">DateTime</Property>
        <Property name="label">有效开始日期</Property>
        <Property name="dataType">Date</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="endTime">
        <Property></Property>
        <Property name="label">有效截至时间</Property>
        <Property name="dataType">DateTime</Property>
        <Property name="label">有效截至日期</Property>
        <Property name="dataType">Date</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="updateUser">
        <Property></Property>