Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesClient

cnf

2025-07-24 262746cb15ee6779f24adeca62eded6389df6ef9

 DevApp/.vs/GsDevSolution/v17/DocumentLayout.backup.json

@@ -3,16 +3,12 @@
  "WorkspaceRootPath": "E:\\MesSourceCode\\PC_Web\\DevApp\\",
  "Documents": [
    {
      "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
      "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\usercontrol\\selectdeletebar.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\usercontrol\\selectdeletebar.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\qc\\jyxm.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\qc\\jyxm.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\devfrm\\qc\\jyxm.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
      "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\devfrm\\qc\\jyxm.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
      "AbsoluteMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|e:\\messourcecode\\pc_web\\devapp\\gs.devapp\\usercontrol\\selectdeletebar.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form",
      "RelativeMoniker": "D:0:0:{A7EB5F78-699E-4514-8905-30842765E673}|Gs.DevApp\\Gs.DevApp.csproj|solutionrelative:gs.devapp\\usercontrol\\selectdeletebar.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form"
    }
  ],
  "DocumentGroupContainers": [
@@ -27,39 +23,26 @@
            {
              "$type": "Document",
              "DocumentIndex": 0,
              "Title": "Program.cs",
              "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\Program.cs",
              "RelativeDocumentMoniker": "Gs.DevApp\\Program.cs",
              "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\Program.cs",
              "RelativeToolTip": "Gs.DevApp\\Program.cs",
              "ViewState": "AgIAACUAAAAAAAAAAAAIwDkAAAAdAAAAAAAAAA==",
              "Title": "SelectDeleteBar.cs",
              "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
              "RelativeDocumentMoniker": "Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
              "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\SelectDeleteBar.cs*",
              "RelativeToolTip": "Gs.DevApp\\UserControl\\SelectDeleteBar.cs*",
              "ViewState": "AgIAALQAAAAAAAAAAAAYwMQAAAABAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-17T02:05:55.42Z",
              "WhenOpened": "2025-07-23T06:57:36.465Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 1,
              "Title": "Jyxm.cs",
              "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
              "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
              "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
              "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
              "ViewState": "AgIAANoCAAAAAAAAAAAQwOcCAAAkAAAAAAAAAA==",
              "Title": "SelectDeleteBar.cs [\u8BBE\u8BA1]",
              "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
              "RelativeDocumentMoniker": "Gs.DevApp\\UserControl\\SelectDeleteBar.cs",
              "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\UserControl\\SelectDeleteBar.cs [\u8BBE\u8BA1]*",
              "RelativeToolTip": "Gs.DevApp\\UserControl\\SelectDeleteBar.cs [\u8BBE\u8BA1]*",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-17T01:55:59.985Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 2,
              "Title": "Jyxm.cs [\u8BBE\u8BA1]",
              "DocumentMoniker": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
              "RelativeDocumentMoniker": "Gs.DevApp\\DevFrm\\QC\\Jyxm.cs",
              "ToolTip": "E:\\MesSourceCode\\PC_Web\\DevApp\\Gs.DevApp\\DevFrm\\QC\\Jyxm.cs [\u8BBE\u8BA1]",
              "RelativeToolTip": "Gs.DevApp\\DevFrm\\QC\\Jyxm.cs [\u8BBE\u8BA1]",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-17T01:35:47.579Z",
              "WhenOpened": "2025-07-23T06:57:22.853Z",
              "EditorCaption": " [\u8BBE\u8BA1]"
            }
          ]
@@ -71,6 +54,10 @@
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{1c64b9c2-e352-428e-a56d-0ace190b99a6}"
            }
          ]
        },