Merge remote-tracking branch 'origin/master'

sgj

昨天 ef7cde2fb1f44de1ffa8b961ee1732fb327e1cd4

 fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDept.view.xml

@@ -32,7 +32,7 @@
    </DataType>
  </Model>
  <View>
    <Property name="packages">font-awesome</Property>
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsCompany">
      <Property name="dataType">[dtCompany]</Property>
      <Property name="dataProvider">selectDeptPR#listCompany</Property>