Merge remote-tracking branch 'origin/master'

sgj

20 小时以前 ef7cde2fb1f44de1ffa8b961ee1732fb327e1cd4

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

@@ -132,7 +132,7 @@
          <Property name="exClassName">btn-q1</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).flushAsync();</ClientEvent>
          <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).setData({});</ClientEvent>
          <Property name="caption">重置</Property>
          <Property name="exClassName">btn-q2</Property>
          <Property name="iconClass">fa fa-refresh</Property>