| WebAPI/Models/Gy_OrderBackInfo.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Models/Gy_OrderLevList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Models/Gy_WorkPayType.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Models/Gy_WorkType.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/WebAPI.csproj.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebAPI/Models/Gy_OrderBackInfo.cs
@@ -1,16 +1,13 @@ <<<<<<< HEAD using System; using System; using System.Collections.Generic; using System.Linq; using System.Web; ======= using System; using System.Collections.Generic; using System.Linq; using System.Web; >>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c namespace WebAPI.Models { public class Gy_OrderBackInfo @@ -22,7 +19,6 @@ public long HParentID { get; set; } //父级ID public long HLevel { get; set; } //层级 public long HEndFlag { get; set; } // <<<<<<< HEAD public string HHelpCode { get; set; } // 助记码 @@ -31,17 +27,5 @@ public bool HStopflag { get; set; } //禁用标志 public bool HUseFlag { get; set; } //使用状态 ======= public string HHelpCode { get; set; } // 助记码 public string HRemark { get; set; } //备注 public bool HStopflag { get; set; } //禁用标志 public bool HUseFlag { get; set; } //使用状态 >>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c } } WebAPI/Models/Gy_OrderLevList.cs
@@ -1,16 +1,13 @@ <<<<<<< HEAD using System; using System.Collections.Generic; using System.Linq; using System.Web; ======= using System; using System.Collections.Generic; using System.Linq; using System.Web; >>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c using System; using System.Collections.Generic; using System.Linq; using System.Web; namespace WebAPI.Models { public class Gy_OrderLevList @@ -18,7 +15,6 @@ public long HItemID { get; set; } //ID public string HNumber { get; set; } //代码 public string HName { get; set; } //名称 <<<<<<< HEAD public string HShortNumber { get; set; } //短代码 public long HParentID { get; set; } //父级ID public long HLevel { get; set; } //层级 @@ -32,21 +28,6 @@ public bool HUseFlag { get; set; } //使用状态 ======= public string HShortNumber { get; set; } // 短代码 public long HParentID { get; set; } //父级ID public long HLevel { get; set; } //层级 public long HEndFlag { get; set; } public string HHelpCode { get; set; } // 助记码 public string HRemark { get; set; } // 备注 public bool HStopflag { get; set; } //禁用标志 public bool HUseFlag { get; set; } //使用状态 >>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c public string HYX { get; set; }//优先级 } } WebAPI/Models/Gy_WorkPayType.cs
@@ -16,20 +16,10 @@ public long HLevel { get; set; } public bool HEndFlag { get; set; } //末级标志 public bool HStopflag { get; set; } //禁用标志 <<<<<<< HEAD public string HRemark { get; set; } //备注 public string HUseFlag { get; set; } //使用标志 ======= public string HRemark { get; set; } //备注 public string HUseFlag { get; set; } //使用标志 >>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c } } WebAPI/Models/Gy_WorkType.cs
@@ -21,14 +21,5 @@ public string HForEmp { get; set; } //短代码 public string HRemark { get; set; } //备注 public string HUseFlag { get; set; } //使用标志 <<<<<<< HEAD ======= >>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c } } WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,25 +18,25 @@ <publishTime>02/22/2013 08:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>10/28/2021 16:27:35</publishTime> <publishTime>11/01/2021 10:28:49</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>10/28/2021 16:27:35</publishTime> <publishTime>11/01/2021 10:28:49</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>10/28/2021 16:27:33</publishTime> <publishTime>11/01/2021 10:28:47</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>10/28/2021 16:27:33</publishTime> <publishTime>11/01/2021 10:28:47</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 14:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>10/28/2021 16:27:30</publishTime> <publishTime>10/25/2021 09:28:38</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>10/28/2021 16:27:30</publishTime> <publishTime>10/25/2021 09:28:38</publishTime> </File> <File Include="bin/Interop.gregn6Lib.dll"> <publishTime>08/25/2021 10:28:25</publishTime> @@ -60,10 +60,10 @@ <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>10/28/2021 16:27:30</publishTime> <publishTime>11/01/2021 10:28:44</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>10/28/2021 16:27:30</publishTime> <publishTime>11/01/2021 10:28:44</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>10/14/2021 09:42:47</publishTime> @@ -72,22 +72,22 @@ <publishTime>08/03/2014 20:33:56</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>10/28/2021 16:27:27</publishTime> <publishTime>10/25/2021 09:28:37</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>10/28/2021 16:27:27</publishTime> <publishTime>10/25/2021 09:28:37</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>10/28/2021 16:27:28</publishTime> <publishTime>10/25/2021 09:28:38</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>10/28/2021 16:27:28</publishTime> <publishTime>10/25/2021 09:28:38</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>10/28/2021 16:27:29</publishTime> <publishTime>10/25/2021 09:28:38</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>10/28/2021 16:27:29</publishTime> <publishTime>10/25/2021 09:28:38</publishTime> </File> <File Include="bin/stdole.dll"> <publishTime>05/09/2021 13:35:37</publishTime> @@ -189,10 +189,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>10/28/2021 16:27:38</publishTime> <publishTime>10/29/2021 09:40:54</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>10/28/2021 16:27:38</publishTime> <publishTime>10/29/2021 09:40:54</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/17/2013 17:03:52</publishTime> @@ -363,7 +363,7 @@ <publishTime>08/06/2021 22:57:28</publishTime> </File> <File Include="Web.config"> <publishTime>10/28/2021 16:27:52</publishTime> <publishTime>10/25/2021 09:28:44</publishTime> </File> </ItemGroup> </Project> WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@ <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>false</UseIISExpress> <Use64BitIISExpress />
