root
|
5733ba4830
合并解决冲突1
|
3 years ago |
root
|
062d381f1e
合并解决冲突
|
3 years ago |
root
|
6c6639f0c6
报单减库存
|
3 years ago |
root
|
16a86df98e
无法报单
|
3 years ago |
root
|
f6f933923a
显示套餐库存
|
3 years ago |
root
|
947b2fef27
为方便测试去掉emial验证
|
3 years ago |
root
|
462a83d775
Merge branch 'feature/theo-translate' into feature/york-1365-i18n-inpro-0613
|
3 years ago |
theo
|
497dbf29d3
email为空时报错
|
3 years ago |
root
|
e180034fc2
个人资料
|
3 years ago |
root
|
f1b9bdc23d
订单减库存
|
3 years ago |
theo
|
192bea9a39
Merge remote-tracking branch 'origin/feature/1559-exchangeRate' into feature/theo-translate
|
3 years ago |
theo
|
20e83efe53
some fixes
|
3 years ago |
theo
|
cdff171ae7
Merge branch 'master' of http://18.167.157.193:1026/guanli/ngds into feature/theo-translate
|
3 years ago |
kevin_zhangl
|
3f73e648d3
会员名字前缀修改为NG开头
|
3 years ago |
kevin_zhangl
|
465feaecb7
Merge branch 'feature/1559-exchangeRate' of http://18.167.157.193:1026/guanli/ngds into feature/1559-exchangeRate
|
3 years ago |
kevin_zhangl
|
25f98bb346
汇率功能发布:商品、订单、奖金、账户、流水、汇率配置
|
3 years ago |
kevin_zhangl
|
cc9c4eddff
汇率功能发布:商品、订单、奖金、账户、流水、汇率配置
|
3 years ago |
theo
|
8f14a12bd7
一些文字修改
|
3 years ago |
theo
|
16e3d0e9dc
一些文字修改
|
3 years ago |
theo
|
89b5ae33a0
添加商品报错
|
3 years ago |
theo
|
7c38ecc497
测试奖金计算
|
3 years ago |
theo
|
821adfccc2
fix sell_type
|
3 years ago |
theo
|
191d32ce30
Merge branch 'feature/york-1365-i18n-inpro' of http://18.167.157.193:1026/guanli/ngds into feature/theo-translate
|
3 years ago |
root
|
a2102bb6c5
界面多语言管理端ing
|
3 years ago |
theo
|
a5bf4ed0de
some bug fixes
|
3 years ago |
root
|
856234a701
rm1462 活跃资格逻辑:报单BV和复消BV之和
|
3 years ago |
root
|
b4f30bec1a
会员升级功能开关
|
3 years ago |
theo
|
488d52744e
some bug fixes
|
3 years ago |
root
|
2dd39e0e26
会员升级合并代码
|
3 years ago |
theo
|
b8484d3f33
Merge branch 'feature/york-1365-i18n-inpro' into feature/theo-translate
|
3 years ago |