Jjie
|
234db4c316
|
Merge branch 'master' of http://119.3.29.177:3000/lacy/PNSRM
# Conflicts:
# NFine.Application/bin/Debug/NFine.Application.dll
# NFine.Application/bin/Debug/NFine.Application.pdb
# NFine.Application/bin/Debug/NFine.Code.dll
# NFine.Application/bin/Debug/NFine.Code.pdb
# NFine.Application/bin/Debug/NFine.Data.dll
# NFine.Application/bin/Debug/NFine.Data.pdb
# NFine.Application/bin/Debug/NFine.Domain.dll
# NFine.Application/bin/Debug/NFine.Domain.pdb
# NFine.Application/bin/Debug/NFine.Repository.dll
# NFine.Application/bin/Debug/NFine.Repository.pdb
# NFine.Application/obj/Debug/NFine.Application.dll
# NFine.Application/obj/Debug/NFine.Application.pdb
# NFine.Code/bin/Debug/NFine.Code.dll
# NFine.Code/bin/Debug/NFine.Code.pdb
# NFine.Code/obj/Debug/NFine.Code.dll
# NFine.Code/obj/Debug/NFine.Code.pdb
# NFine.Data/bin/Debug/NFine.Code.dll
# NFine.Data/bin/Debug/NFine.Code.pdb
# NFine.Data/bin/Debug/NFine.Data.dll
# NFine.Data/bin/Debug/NFine.Data.pdb
# NFine.Data/obj/Debug/NFine.Data.dll
# NFine.Data/obj/Debug/NFine.Data.pdb
# NFine.Domain/bin/Debug/NFine.Code.dll
# NFine.Domain/bin/Debug/NFine.Code.pdb
# NFine.Domain/bin/Debug/NFine.Data.dll
# NFine.Domain/bin/Debug/NFine.Data.pdb
# NFine.Domain/bin/Debug/NFine.Domain.dll
# NFine.Domain/bin/Debug/NFine.Domain.pdb
# NFine.Domain/obj/Debug/NFine.Domain.dll
# NFine.Domain/obj/Debug/NFine.Domain.pdb
# NFine.Mapping/bin/Debug/NFine.Code.dll
# NFine.Mapping/bin/Debug/NFine.Code.pdb
# NFine.Mapping/bin/Debug/NFine.Data.dll
# NFine.Mapping/bin/Debug/NFine.Data.pdb
# NFine.Mapping/bin/Debug/NFine.Domain.dll
# NFine.Mapping/bin/Debug/NFine.Domain.pdb
# NFine.Mapping/bin/Debug/NFine.Mapping.dll
# NFine.Mapping/bin/Debug/NFine.Mapping.pdb
# NFine.Mapping/obj/Debug/NFine.Mapping.dll
# NFine.Mapping/obj/Debug/NFine.Mapping.pdb
# NFine.Repository/bin/Debug/NFine.Code.dll
# NFine.Repository/bin/Debug/NFine.Code.pdb
# NFine.Repository/bin/Debug/NFine.Data.dll
# NFine.Repository/bin/Debug/NFine.Data.pdb
# NFine.Repository/bin/Debug/NFine.Domain.dll
# NFine.Repository/bin/Debug/NFine.Domain.pdb
# NFine.Repository/bin/Debug/NFine.Repository.dll
# NFine.Repository/bin/Debug/NFine.Repository.pdb
# NFine.Repository/obj/Debug/NFine.Repository.dll
# NFine.Repository/obj/Debug/NFine.Repository.pdb
# NFine.Web/bin/NFine.Application.dll
# NFine.Web/bin/NFine.Application.pdb
# NFine.Web/bin/NFine.Code.dll
# NFine.Web/bin/NFine.Code.pdb
# NFine.Web/bin/NFine.Data.dll
# NFine.Web/bin/NFine.Data.pdb
# NFine.Web/bin/NFine.Domain.dll
# NFine.Web/bin/NFine.Domain.pdb
# NFine.Web/bin/NFine.Mapping.dll
# NFine.Web/bin/NFine.Mapping.pdb
# NFine.Web/bin/NFine.Repository.dll
# NFine.Web/bin/NFine.Repository.pdb
# NFine.Web/bin/NFine.Web.dll
# NFine.Web/bin/NFine.Web.pdb
# NFine.Web/obj/Debug/NFine.Web.dll
# NFine.Web/obj/Debug/NFine.Web.pdb
|
1 week ago |
Jjie
|
63260b4c17
|
no message
|
1 week ago |
lacy
|
e8bd7d4b0e
|
派那修改
|
2 weeks ago |
lacy
|
16967d4ce6
|
派那修改
|
2 weeks ago |
lacy
|
f19fd3fa81
|
修改
|
2 weeks ago |
lacy
|
b8d20ae1ec
|
11
|
3 weeks ago |
lacy
|
ef3b8c209a
|
11
|
3 weeks ago |
lacy
|
3ae2a77bc2
|
1
|
3 weeks ago |
Jjie
|
c4062e3c68
|
no message
|
3 weeks ago |
Jjie
|
90c484f126
|
no message
|
3 weeks ago |
Jjie
|
025998d116
|
no message
|
4 weeks ago |
Jjie
|
cbc751d5d0
|
派纳采购委外生成条码
|
4 weeks ago |
Jjie
|
036a06f2bd
|
Merge branch 'master' of http://119.3.29.177:3000/lacy/PNSRM
# Conflicts:
# NFine.Application/bin/Debug/NFine.Application.dll
# NFine.Application/bin/Debug/NFine.Application.pdb
# NFine.Application/bin/Debug/NFine.Domain.dll
# NFine.Application/bin/Debug/NFine.Domain.pdb
# NFine.Application/bin/Debug/NFine.Repository.dll
# NFine.Application/bin/Debug/NFine.Repository.pdb
# NFine.Application/obj/Debug/NFine.Application.dll
# NFine.Application/obj/Debug/NFine.Application.pdb
# NFine.Domain/bin/Debug/NFine.Domain.dll
# NFine.Domain/bin/Debug/NFine.Domain.pdb
# NFine.Domain/obj/Debug/NFine.Domain.dll
# NFine.Domain/obj/Debug/NFine.Domain.pdb
# NFine.Mapping/bin/Debug/NFine.Domain.dll
# NFine.Mapping/bin/Debug/NFine.Domain.pdb
# NFine.Mapping/bin/Debug/NFine.Mapping.dll
# NFine.Mapping/bin/Debug/NFine.Mapping.pdb
# NFine.Mapping/obj/Debug/NFine.Mapping.dll
# NFine.Mapping/obj/Debug/NFine.Mapping.pdb
# NFine.Repository/bin/Debug/NFine.Domain.dll
# NFine.Repository/bin/Debug/NFine.Domain.pdb
# NFine.Repository/bin/Debug/NFine.Repository.dll
# NFine.Repository/bin/Debug/NFine.Repository.pdb
# NFine.Repository/obj/Debug/NFine.Repository.dll
# NFine.Repository/obj/Debug/NFine.Repository.pdb
# NFine.Web/bin/NFine.Application.dll
# NFine.Web/bin/NFine.Application.pdb
# NFine.Web/bin/NFine.Domain.dll
# NFine.Web/bin/NFine.Domain.pdb
# NFine.Web/bin/NFine.Mapping.dll
# NFine.Web/bin/NFine.Mapping.pdb
# NFine.Web/bin/NFine.Repository.dll
# NFine.Web/bin/NFine.Repository.pdb
# NFine.Web/bin/NFine.Web.dll
# NFine.Web/bin/NFine.Web.pdb
# NFine.Web/obj/Debug/NFine.Web.dll
# NFine.Web/obj/Debug/NFine.Web.pdb
|
1 month ago |
Jjie
|
850811820f
|
no message
|
1 month ago |
lacy
|
6d5d45c2df
|
3
|
1 month ago |
lacy
|
8b7a073e82
|
2
|
1 month ago |
lacy
|
e650b0599a
|
1
|
1 month ago |
lacy
|
c403116502
|
12
|
1 month ago |
Jjie
|
24d14ef697
|
no message
|
1 month ago |
Jjie
|
71e2d43ee5
|
no message
|
2 months ago |
Jjie
|
4e5f821e05
|
Merge branch 'master' of http://119.3.29.177:3000/lacy/PNSRM
# Conflicts:
# NFine.Web/NFine.Web.csproj
|
2 months ago |
Jjie
|
43963468a4
|
no message
|
2 months ago |
lacy
|
9fdbbed936
|
1
|
2 months ago |
Jjie
|
e129bf5632
|
Merge branch 'master' of http://119.3.29.177:3000/lacy/PNSRM
# Conflicts:
# NFine.Application/bin/Debug/NFine.Application.dll
# NFine.Application/bin/Debug/NFine.Application.pdb
# NFine.Application/bin/Debug/NFine.Code.dll
# NFine.Application/bin/Debug/NFine.Code.pdb
# NFine.Application/bin/Debug/NFine.Data.dll
# NFine.Application/bin/Debug/NFine.Data.pdb
# NFine.Application/bin/Debug/NFine.Domain.dll
# NFine.Application/bin/Debug/NFine.Domain.pdb
# NFine.Application/bin/Debug/NFine.Repository.dll
# NFine.Application/bin/Debug/NFine.Repository.pdb
# NFine.Application/obj/Debug/NFine.Application.dll
# NFine.Application/obj/Debug/NFine.Application.pdb
# NFine.Code/bin/Debug/NFine.Code.dll
# NFine.Code/bin/Debug/NFine.Code.pdb
# NFine.Code/obj/Debug/NFine.Code.dll
# NFine.Code/obj/Debug/NFine.Code.pdb
# NFine.Data/bin/Debug/NFine.Code.dll
# NFine.Data/bin/Debug/NFine.Code.pdb
# NFine.Data/bin/Debug/NFine.Data.dll
# NFine.Data/bin/Debug/NFine.Data.pdb
# NFine.Data/obj/Debug/NFine.Data.dll
# NFine.Data/obj/Debug/NFine.Data.pdb
# NFine.Domain/bin/Debug/NFine.Code.dll
# NFine.Domain/bin/Debug/NFine.Code.pdb
# NFine.Domain/bin/Debug/NFine.Data.dll
# NFine.Domain/bin/Debug/NFine.Data.pdb
# NFine.Domain/bin/Debug/NFine.Domain.dll
# NFine.Domain/bin/Debug/NFine.Domain.pdb
# NFine.Domain/obj/Debug/NFine.Domain.dll
# NFine.Domain/obj/Debug/NFine.Domain.pdb
# NFine.Mapping/bin/Debug/NFine.Code.dll
# NFine.Mapping/bin/Debug/NFine.Code.pdb
# NFine.Mapping/bin/Debug/NFine.Data.dll
# NFine.Mapping/bin/Debug/NFine.Data.pdb
# NFine.Mapping/bin/Debug/NFine.Domain.dll
# NFine.Mapping/bin/Debug/NFine.Domain.pdb
# NFine.Mapping/bin/Debug/NFine.Mapping.dll
# NFine.Mapping/bin/Debug/NFine.Mapping.pdb
# NFine.Mapping/obj/Debug/NFine.Mapping.dll
# NFine.Mapping/obj/Debug/NFine.Mapping.pdb
# NFine.Repository/bin/Debug/NFine.Code.dll
# NFine.Repository/bin/Debug/NFine.Code.pdb
# NFine.Repository/bin/Debug/NFine.Data.dll
# NFine.Repository/bin/Debug/NFine.Data.pdb
# NFine.Repository/bin/Debug/NFine.Domain.dll
# NFine.Repository/bin/Debug/NFine.Domain.pdb
# NFine.Repository/bin/Debug/NFine.Repository.dll
# NFine.Repository/bin/Debug/NFine.Repository.pdb
# NFine.Repository/obj/Debug/NFine.Repository.dll
# NFine.Repository/obj/Debug/NFine.Repository.pdb
# NFine.Web/NFine.Web.csproj
# NFine.Web/bin/NFine.Application.dll
# NFine.Web/bin/NFine.Application.pdb
# NFine.Web/bin/NFine.Code.dll
# NFine.Web/bin/NFine.Code.pdb
# NFine.Web/bin/NFine.Data.dll
# NFine.Web/bin/NFine.Data.pdb
# NFine.Web/bin/NFine.Domain.dll
# NFine.Web/bin/NFine.Domain.pdb
# NFine.Web/bin/NFine.Mapping.dll
# NFine.Web/bin/NFine.Mapping.pdb
# NFine.Web/bin/NFine.Repository.dll
# NFine.Web/bin/NFine.Repository.pdb
# NFine.Web/bin/NFine.Web.dll
# NFine.Web/bin/NFine.Web.pdb
# NFine.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
# NFine.Web/obj/Debug/NFine.Web.dll
# NFine.Web/obj/Debug/NFine.Web.pdb
|
2 months ago |
Jjie
|
cfe6e7c319
|
no message
|
2 months ago |
lacy
|
ce3d82c9df
|
派纳修改
|
2 months ago |
lacy
|
04f1bebfda
|
1
|
2 months ago |
lacy
|
adae7fc2f6
|
1
|
2 months ago |
lacy
|
ef94eea30b
|
1
|
2 months ago |
Jjie
|
fa13a15bd7
|
no message
|
2 months ago |
lacy
|
42bedde382
|
派纳修改
|
2 months ago |
Jjie
|
d4d5a9317f
|
no message
|
2 months ago |
lacy
|
0bf169fda0
|
1
|
2 months ago |
lacy
|
f8c2c5c553
|
1
|
2 months ago |
lacy
|
eccbe06707
|
派纳代码
|
2 months ago |