Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS
This commit is contained in:
commit
7c8f5b2477
|
|
@ -99,13 +99,8 @@ namespace BLL
|
|||
{
|
||||
newWelder.PhotoUrl = welder.PhotoUrl;
|
||||
needUpdatePic = true;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(welder.WED_Code) && newWelder.WED_Code != welder.WED_Code)
|
||||
{
|
||||
newWelder.WED_Code = welder.WED_Code;
|
||||
needUpdatePic = true;
|
||||
}
|
||||
}
|
||||
|
||||
db.SubmitChanges();
|
||||
if (needUpdatePic)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -14,8 +14,9 @@
|
|||
<VisualStudio>
|
||||
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
|
||||
<WebProjectProperties>
|
||||
<StartPageUrl>Login.aspx</StartPageUrl>
|
||||
<StartAction>SpecificPage</StartAction>
|
||||
<StartPageUrl>
|
||||
</StartPageUrl>
|
||||
<StartAction>CurrentPage</StartAction>
|
||||
<AspNetDebugging>True</AspNetDebugging>
|
||||
<SilverlightDebugging>False</SilverlightDebugging>
|
||||
<NativeDebugging>False</NativeDebugging>
|
||||
|
|
@ -34,7 +35,7 @@
|
|||
<AutoAssignPort>True</AutoAssignPort>
|
||||
<DevelopmentServerPort>0</DevelopmentServerPort>
|
||||
<DevelopmentServerVPath>/</DevelopmentServerVPath>
|
||||
<IISUrl>http://localhost:64304/</IISUrl>
|
||||
<IISUrl>http://localhost:60961/</IISUrl>
|
||||
<NTLMAuthentication>False</NTLMAuthentication>
|
||||
<UseCustomServer>False</UseCustomServer>
|
||||
<CustomServerUrl>
|
||||
|
|
|
|||
Loading…
Reference in New Issue