Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-06-29 651dfb24aa82ea28e6348907bc02dc8c84a6e13f

 igds-core/src/main/java/models/igds.model.xml

@@ -194,12 +194,12 @@
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">true</Property>
      <Property name="required">false</Property>
    </PropertyDef>
    <PropertyDef name="granaryId">
      <Property></Property>
      <Property name="label">所属廒间</Property>
      <Property name="required">true</Property>
      <Property name="required">false</Property>
    </PropertyDef>
    <PropertyDef name="depotType">
      <Property></Property>
@@ -231,7 +231,7 @@
      <Property name="dataType">Double</Property>
      <Property name="label">实际储量</Property>
      <Property name="displayFormat">#,##0 KG</Property>
      <Property name="required">true</Property>
      <Property name="required">false</Property>
    </PropertyDef>
    <PropertyDef name="storeType">
      <Property></Property>
@@ -1095,32 +1095,6 @@
      <Property name="label">页面中的坐标</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtFoodOrigin">
    <Property name="creationType">com.ld.igds.models.DicFoodOrigin</Property>
    <PropertyDef name="id">
      <Property name="dataType">int</Property>
    </PropertyDef>
    <PropertyDef name="code">
      <Property></Property>
      <Property name="label">产地编码</Property>
    </PropertyDef>
    <PropertyDef name="name">
      <Property></Property>
      <Property name="label">产地名称</Property>
    </PropertyDef>
    <PropertyDef name="sort">
      <Property name="dataType">int</Property>
      <Property name="label">排序</Property>
    </PropertyDef>
    <PropertyDef name="simple">
      <Property></Property>
      <Property name="label">产地简拼</Property>
    </PropertyDef>
    <PropertyDef name="disabledTag">
      <Property></Property>
      <Property name="label">是否禁用</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtSecFire">
    <Property name="creationType">com.ld.igds.models.SecFire</Property>
    <PropertyDef name="id">
@@ -1288,6 +1262,18 @@
    <PropertyDef name="type">
      <Property name="label">类型</Property>
    </PropertyDef>
    <PropertyDef name="simple">
      <Property></Property>
      <Property name="label">简拼</Property>
    </PropertyDef>
    <PropertyDef name="disabledTag">
      <Property></Property>
      <Property name="label">是否禁用</Property>
    </PropertyDef>
    <PropertyDef name="remark">
      <Property></Property>
      <Property name="label">备注信息</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtFileData">
    <Property name="creationType">com.ld.igds.file.dto.FileData</Property>