Merge remote-tracking branch 'origin/master'

sgj

2 天以前 d491a7503e9b33f26afa39834d8c456a673607bb

 fzzy-igdss-view/src/main/java/models/core.model.xml

@@ -66,7 +66,7 @@
    </PropertyDef>
    <PropertyDef name="companyId">
      <Property></Property>
      <Property name="label">组织编码</Property>
      <Property name="label">收储公司</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getData&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>