Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-11-13 3d65ee18d645a30e600c9b63f0daefe2fc2b1151

 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_ListMQBMLB#925.def

@@ -28,7 +28,7 @@
      ]
      Properties:
      [
        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":2,"display":"always","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"Value","subtotals":"","tooltip":"","width":6,"display":"always","editable":false,"attribute":"StringValue"}}]'
        ContextMenu: 'listContextMenu319'
        Taborder: 2
      ]
@@ -36,6 +36,7 @@
  ]
  Properties:
  [
    MinimumColumns: 8
    Taborder: 0
  ]
}