lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2023-08-31 14:13:18 +08:00
parent 496f95e530 14c5600240
commit d9f8be1463
4 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/BLL.csproj
+2 -2
View File
@@ -106,8 +106,8 @@
<Reference Include="QRCoder, Version=1.4.3.0, Culture=neutral, PublicKeyToken=c4ed5b9ae8358a28, processorArchitecture=MSIL"> <Reference Include="QRCoder, Version=1.4.3.0, Culture=neutral, PublicKeyToken=c4ed5b9ae8358a28, processorArchitecture=MSIL">
<HintPath>..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll</HintPath> <HintPath>..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll</HintPath>
</Reference> </Reference>
<Reference Include="Quartz, Version=3.5.0.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL"> <Reference Include="Quartz, Version=3.7.0.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<HintPath>..\packages\Quartz.3.5.0\lib\netstandard2.0\Quartz.dll</HintPath> <HintPath>..\packages\Quartz.3.7.0\lib\netstandard2.0\Quartz.dll</HintPath>
</Reference> </Reference>
<Reference Include="RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL"> <Reference Include="RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll</HintPath> <HintPath>..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll</HintPath>
SGGL/BLL/CQMS/WBS/WorkPackageService.cs
+1 -1
View File
@@ -405,7 +405,7 @@ namespace BLL
row[12] = workPackage.RealStartDate; row[12] = workPackage.RealStartDate;
} }
if (workPackage.RealEndDate != null) if (workPackage.RealEndDate != null)
{ {
row[13] = workPackage.RealEndDate; row[13] = workPackage.RealEndDate;
} }
if (workPackage.PlanCost != null) if (workPackage.PlanCost != null)
SGGL/Model/Model.cs
+5 -5
View File
@@ -11539,7 +11539,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")]
public string ApproveIdea public string ApproveIdea
{ {
get get
@@ -149756,7 +149756,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
public string AttentPerson public string AttentPerson
{ {
get get
@@ -180965,7 +180965,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EstimatedAmount", DbType="Decimal(18,0)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EstimatedAmount", DbType="Decimal(18,2)")]
public System.Nullable<decimal> EstimatedAmount public System.Nullable<decimal> EstimatedAmount
{ {
get get
@@ -181005,7 +181005,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SettledAmount", DbType="Decimal(18,0)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SettledAmount", DbType="Decimal(18,2)")]
public System.Nullable<decimal> SettledAmount public System.Nullable<decimal> SettledAmount
{ {
get get
@@ -181179,7 +181179,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")]
public System.Nullable<decimal> WorkPackageEstimate public System.Nullable<decimal> WorkPackageEstimate
{ {
get get
SGGL/SGGL.sln
+2 -16
View File
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17 # Visual Studio 15
VisualStudioVersion = 17.5.33516.290 VisualStudioVersion = 15.0.28307.2017
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Web", "FineUIPro.Web\FineUIPro.Web.csproj", "{C88D3156-2D56-4DB0-922E-1995FB61C9BD}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Web", "FineUIPro.Web\FineUIPro.Web.csproj", "{C88D3156-2D56-4DB0-922E-1995FB61C9BD}"
EndProject EndProject
@@ -13,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebAPI", "WebAPI\WebAPI.csp
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Mobile", "FineUIPro.Mobile\FineUIPro.Mobile.csproj", "{6FD4603B-1B6D-48AE-A1BD-7385495F81FD}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Mobile", "FineUIPro.Mobile\FineUIPro.Mobile.csproj", "{6FD4603B-1B6D-48AE-A1BD-7385495F81FD}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BLLTests", "BLLTests\BLLTests.csproj", "{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -79,18 +77,6 @@ Global
{6FD4603B-1B6D-48AE-A1BD-7385495F81FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU {6FD4603B-1B6D-48AE-A1BD-7385495F81FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{6FD4603B-1B6D-48AE-A1BD-7385495F81FD}.Release|x86.ActiveCfg = Release|Any CPU {6FD4603B-1B6D-48AE-A1BD-7385495F81FD}.Release|x86.ActiveCfg = Release|Any CPU
{6FD4603B-1B6D-48AE-A1BD-7385495F81FD}.Release|x86.Build.0 = Release|Any CPU {6FD4603B-1B6D-48AE-A1BD-7385495F81FD}.Release|x86.Build.0 = Release|Any CPU
{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|x86.ActiveCfg = Debug|Any CPU
{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Debug|x86.Build.0 = Debug|Any CPU
{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|Any CPU.Build.0 = Release|Any CPU
{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|x86.ActiveCfg = Release|Any CPU
{18AAB08A-2C8E-4EB8-AC43-725E0CA28C6B}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE