 hao.ma
|
d002557c6c
|
Merge pull request 'master-mahao' (#1) from master-mahao into master
Reviewed-on: http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount/pulls/1
|
1 year ago |
|
mahao
|
ad0ac03775
|
Merge remote-tracking branch 'origin/master' into master-mahao
|
1 year ago |
|
mahao
|
50a26ff27c
|
销售价格、备件价格
|
1 year ago |
wanggang
|
e442b7fe1c
|
Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount
|
1 year ago |
|
wanggang
|
80c7755992
|
update
|
1 year ago |
姜旭之
|
96df302c0c
|
UPDATE
|
1 year ago |
|
wanggang
|
3d05f7e929
|
Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount
|
1 year ago |
|
wanggang
|
ac7bee6eb4
|
1.修改前端代码适配ABP4的接口：获取站点信息、登录、获取用户信息；2.添加用户和角色的路由和表单配置，适配列表功能
|
1 year ago |
|
姜旭之
|
23e3c45e3e
|
update
|
1 year ago |
|
姜旭之
|
973e2925ee
|
Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount
|
1 year ago |
|
mahao
|
558b356ab1
|
提交
|
1 year ago |
|
mahao
|
a1ab64ee98
|
EF迁移
|
1 year ago |
|
mahao
|
0b95ac0341
|
提交销售价格实体
|
1 year ago |
 学 赵
|
e3b709c205
|
更新接口
|
1 year ago |
|
学 赵
|
9514b7076e
|
更新接口
|
1 year ago |
|
mahao
|
0f899b61f3
|
提交
|
1 year ago |
|
mahao
|
7185c04b9f
|
提交
|
1 year ago |
|
mahao
|
154caa576e
|
Merge remote-tracking branch 'origin/master' into master-mahao
|
1 year ago |
|
mahao
|
e71c8d8ee5
|
修改销售价格
|
1 year ago |
|
学 赵
|
837f30f86f
|
更新版本
|
1 year ago |
|
学 赵
|
aa830c1242
|
更新版本
|
1 year ago |
fangdawei
|
76393c5905
|
Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount
# Conflicts:
# code/src/SmartFactorySuite.sln
|
1 year ago |
|
fangdawei
|
acbbf62b31
|
基础数据EF配置代码提交，价格、备件价格、物料主数据、物料关系、BOM等
|
1 year ago |
|
mahao
|
a6caef3ae6
|
Merge branch 'master-mahao'
|
1 year ago |
|
mahao
|
5e6281b725
|
提交
|
1 year ago |
|
mahao
|
c7174fba06
|
提交
|
1 year ago |
|
mahao
|
b7591f8ead
|
提交
|
1 year ago |
|
mahao
|
e0d3c8b10d
|
Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount
|
1 year ago |
|
mahao
|
220dc30c1a
|
提交
|
1 year ago |
|
学 赵
|
f0c9b7d074
|
更新上下文基础数据
|
1 year ago |
|
wanggang
|
9c82fcbbef
|
提交原型文件
|
1 year ago |
|
学 赵
|
90fabac22e
|
个更新版本
|
1 year ago |
|
学 赵
|
fa6ddbca06
|
Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount
|
1 year ago |
|
学 赵
|
5a5d0272e8
|
更新版本
|
1 year ago |
|
姜旭之
|
7f930d4e10
|
Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount
|
1 year ago |
|
姜旭之
|
0fff5b3d77
|
la qu
|
1 year ago |
|
wanggang
|
fdfd725254
|
update
|
1 year ago |
|
wanggang
|
a5bb6d650f
|
update
|
1 year ago |
|
学 赵
|
47a20fd857
|
更新版本
|
1 year ago |
|
姜旭之
|
93efe75988
|
Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount
|
1 year ago |
|
姜旭之
|
2806c0e20f
|
update
|
1 year ago |
|
wanggang
|
85e4abd65e
|
update
|
1 year ago |
|
学 赵
|
de63165831
|
Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount
|
1 year ago |
|
学 赵
|
ab2f8f27b1
|
更新基类
|
1 year ago |
|
fangdawei
|
a74dd1a3c1
|
Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount
# Conflicts:
# code/src/Modules/BaseService/BaseService.Host/appsettings.json
# code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj
# code/src/Shared/Win.Abp.Snowflakes/bin/Release/netcoreapp5/Win.Abp.Snowflakes.dll
# code/src/Shared/Win.Abp.Snowflakes/bin/Release/netcoreapp5/Win.Abp.Snowflakes.pdb
# code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig
# code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.assets.cache
# code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache
# code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache
# code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt
# code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.dll
# code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.pdb
# code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/ref/Win.Abp.Snowflakes.dll
# code/src/Shared/Win.Abp.Snowflakes/obj/project.nuget.cache
# code/src/Shared/Win.Sfs.Shared/bin/Debug/Win.Sfs.Shared.2.0.0.nupkg
# code/src/Shared/Win.Sfs.Shared/bin/Release/Win.Sfs.Shared.2.0.0.nupkg
# code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.dll
# code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.pdb
# code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Utils.dll
# code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Utils.pdb
# code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache
# code/src/Shared/Win.Sfs.Shared/obj/Release/Win.Sfs.Shared.2.0.0.nuspec
# code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig
# code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.assets.cache
# code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache
# code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache
# code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt
# code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.dll
# code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.pdb
# code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/ref/Win.Sfs.Shared.dll
# code/src/Shared/Win.Sfs.Shared/obj/project.nuget.cache
# code/src/Shared/Win.Utils/bin/Debug/Win.Utils.2.0.0.nupkg
# code/src/Shared/Win.Utils/bin/Release/Win.Utils.2.0.0.nupkg
# code/src/Shared/Win.Utils/bin/Release/netcoreapp5/Win.Utils.dll
# code/src/Shared/Win.Utils/bin/Release/netcoreapp5/Win.Utils.pdb
# code/src/Shared/Win.Utils/obj/Release/Win.Utils.2.0.0.nuspec
# code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig
# code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.assets.cache
# code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache
# code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache
# code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt
# code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.dll
# code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.pdb
# code/src/Shared/Win.Utils/obj/Release/netcoreapp5/ref/Win.Utils.dll
# code/src/Shared/Win.Utils/obj/project.nuget.cache
# code/src/SmartFactorySuite.sln
|
1 year ago |
|
fangdawei
|
af2a13573e
|
代码提交
|
1 year ago |
|
fangdawei
|
969b25f3e8
|
前端vue2.0参照
|
1 year ago |
|
wanggang
|
1c29465007
|
update
|
1 year ago |
|
wanggang
|
0737746148
|
添加图标缓存
|
1 year ago |
|
wanggang
|
a0c180b2bb
|
update
|
1 year ago |
