处理冲突

lixiaojun

2024-10-12 a8ccc992964272f6a74631e8c164e8c91e5cb6d4

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup />
  <ItemGroup>
    <Compile Update="00-core\SetUseStatusDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump\02-ViewPumpInformation\ViewPumpInformationDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump\03-PumpType\AddPumpTypeDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump\03-PumpType\EditPumpTypeDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump\AddPumpProductGroupDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump\AddPumpProductMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump\AddPumpProductSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump\01-EditPumpPartProp\EditPumpPartPropDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump\EditPumpProductGroupDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump\EditPumpProductMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump\EditPumpProductSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-pump\01-EditPumpPartProp\PumpProductListBox.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-pump\PumpProductMainPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-pump\PumpProductSeriesTreeListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-valve\01-series\AddValveSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-valve\01-series\EditValveSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-valve\02-main\AddValveMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-valve\02-main\EditValveMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-valve\ValveManageMainPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-pipe\02-main\AddPipeMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-pipe\02-main\DescriptionDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="00-core\SetDefaultStatusDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-pipe\02-main\EditPipeMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="05-elbow\02-main\AddElbowMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="05-elbow\02-main\EditElbowMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="06-threeLink\02-main\AddThreeLinkMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="06-threeLink\02-main\EditThreeLinkMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourLink\01-series\AddPipeLineSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourLink\01-series\EditPipeLineSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourLink\01-series\PipeLineTreeListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="07-fourLink\02-main\AddFourLinkMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourLink\02-main\EditFourLinkMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="07-fourLink\02-main\FourLinkManageMainPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="08-nozzle\02-main\AddNozzleMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="08-nozzle\02-main\EditNozzleMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="09-manufacturer\AddManufacturerDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="09-manufacturer\EditManufacturerDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="09-manufacturer\ManufacturerMainPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="10-equipment\ManufacturerMainPanel.cs">
      <SubType>UserControl</SubType>
    </Compile>
  </ItemGroup>
</Project>