Merge remote-tracking branch 'origin/master'

sgj

2026-01-05 7b973b3b9b723f48c54f2c0c5083886573224541

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

@@ -594,7 +594,6 @@
      <Property name="caption">结算信息</Property>
      <Property name="width">65%</Property>
      <Property name="closeable">false</Property>
      <Property name="height">70%</Property>
      <Buttons>
        <Button id="btnOK">
          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;