 胡锐
|
5589a5bf10
|
Merge branch '2.0-dev' of http://139.159.177.244:3000/yuanye/high-web into 2.0-dev
|
2 years ago |
|
胡锐
|
d22d7d288e
|
提交代码
|
2 years ago |
 袁野
|
26b5d92386
|
提交代理商订单页面
|
2 years ago |
|
胡锐
|
b96825ee0f
|
提交代码
|
2 years ago |
|
袁野
|
0295475e8b
|
提交代理商订单页面
|
2 years ago |
|
袁野
|
299cd034b3
|
提交代理商订单页面
|
2 years ago |
|
袁野
|
644083361a
|
提交代理商订单页面
|
2 years ago |
|
袁野
|
8e4b4ec0b1
|
提交代理商订单页面
|
2 years ago |
|
胡锐
|
386306fed0
|
提交代码
|
2 years ago |
|
袁野
|
c991b9063d
|
Merge branch 'order' into 2.0-dev
* order:
提交代码
# Conflicts:
# src/app/admin/index/index.module.ts
|
2 years ago |
|
胡锐
|
502d00fc6e
|
提交代码
|
2 years ago |
|
袁野
|
2f21e7ddc2
|
1
|
2 years ago |
|
袁野
|
c8af1bd39d
|
1
|
2 years ago |
|
胡锐
|
843c8ce02f
|
提交代码
|
2 years ago |
|
胡锐
|
64681d728f
|
提交代码
|
2 years ago |
|
胡锐
|
60ba036449
|
提交代码
|
2 years ago |
|
袁野
|
84a57f36fb
|
1
|
2 years ago |
|
袁野
|
5cf885e928
|
1
|
2 years ago |
|
袁野
|
5b56b8dcca
|
Merge branch 'dev_yy' into 2.0-dev
* dev_yy:
提交代理商订单页面
提交代理商订单页面
1
提交抽奖内容
提交代码
1
# Conflicts:
# src/app/admin/index/index.module.ts
# src/app/app-common.module.ts
# src/app/pipes/index.ts
# src/app/services/index.service.ts
# src/environments/environment.ts
|
2 years ago |
|
袁野
|
51a09f3aee
|
提交代理商订单页面
|
2 years ago |
|
袁野
|
775e6c616f
|
提交代理商订单页面
|
2 years ago |
|
袁野
|
06a882f714
|
提交首页 统计页面
|
2 years ago |
|
袁野
|
50b7e4a97e
|
1
|
2 years ago |
|
袁野
|
f0c7f84edf
|
Merge branch 'fleet_card' of http://139.159.177.244:3000/yuanye/high-web into dev_yy
|
2 years ago |
|
袁野
|
c42cdcfeec
|
提交抽奖内容
|
2 years ago |
|
胡锐
|
06054e53d1
|
提交代码
|
2 years ago |
|
胡锐
|
9ab860bff6
|
提交代码
|
2 years ago |
|
袁野
|
efe1c343df
|
1
|
2 years ago |
|
袁野
|
c8cf133b12
|
提交首页 统计页面
|
2 years ago |
|
胡锐
|
d9a6b4184b
|
提交代码
|
2 years ago |
|
胡锐
|
f9f4fc692f
|
提交代码
|
2 years ago |
|
袁野
|
7821421839
|
Merge branch 'order' of http://139.159.177.244:3000/yuanye/high-web into order
* 'order' of http://139.159.177.244:3000/yuanye/high-web:
提交代码
# Conflicts:
# src/app/admin/order-manage/order-manage.module.ts
|
2 years ago |
|
袁野
|
c4b5689d65
|
Merge branch 'order' of http://139.159.177.244:3000/yuanye/high-web into order
* 'order' of http://139.159.177.244:3000/yuanye/high-web:
提交代码
# Conflicts:
# src/app/admin/order-manage/order-manage.module.ts
|
2 years ago |
|
袁野
|
2d4f39ce48
|
Merge remote-tracking branch 'origin/order' into order
|
2 years ago |
|
袁野
|
191d3d623d
|
Merge branch 'order' of http://139.159.177.244:3000/yuanye/high-web into order
* 'order' of http://139.159.177.244:3000/yuanye/high-web:
提交代码
# Conflicts:
# src/app/admin/order-manage/order-manage.module.ts
|
2 years ago |
|
胡锐
|
f19879aefe
|
提交代码
|
2 years ago |
|
胡锐
|
14c2ea96c0
|
提交代码
|
2 years ago |
|
胡锐
|
b49bd53346
|
提交代码
|
2 years ago |
|
袁野
|
5c7909b680
|
Merge branch 'order' of http://139.159.177.244:3000/yuanye/high-web into order
* 'order' of http://139.159.177.244:3000/yuanye/high-web:
提交代码
# Conflicts:
# src/app/admin/order-manage/order-manage.module.ts
|
2 years ago |
|
袁野
|
5087ce55d5
|
Merge branch 'dev' into order
* dev:
no message
修改话费订单导出问题
修改话费订单导出问题
1
1
1
提交代码
提交代码
1
新增油站生成二维码
# Conflicts:
# src/app/admin/promotion/distribution-integral-list/distribution-integral-list.component.ts
# src/app/app-common.module.ts
# src/app/pipes/index.ts
# src/app/pipes/paytype.pipe.ts
# src/environments/environment.ts
|
2 years ago |
|
胡锐
|
b466d96d91
|
提交代码
|
2 years ago |
|
袁野
|
8a3107ceeb
|
1
|
2 years ago |
|
袁野
|
8651d46381
|
Merge branch 'order' of http://139.159.177.244:3000/yuanye/high-web into order
* 'order' of http://139.159.177.244:3000/yuanye/high-web:
提交代码
# Conflicts:
# src/app/app-common.module.ts
# src/app/pipes/index.ts
|
2 years ago |
|
袁野
|
22ac0ee3fe
|
Merge branch 'dev' into order
* dev:
no message
修改话费订单导出问题
修改话费订单导出问题
1
1
1
提交代码
提交代码
1
新增油站生成二维码
# Conflicts:
# src/app/admin/promotion/distribution-integral-list/distribution-integral-list.component.ts
# src/app/app-common.module.ts
# src/app/pipes/index.ts
# src/app/pipes/paytype.pipe.ts
# src/environments/environment.ts
|
2 years ago |
|
胡锐
|
9929726011
|
提交代码
|
2 years ago |
|
胡锐
|
027b5f39a9
|
提交代码
|
2 years ago |
|
袁野
|
def81dabc3
|
1
|
2 years ago |
|
袁野
|
42576c897c
|
Merge branch 'master' into dev
* master:
修改话费订单导出问题
修改话费订单导出问题
1
1
1
# Conflicts:
# src/app/admin/coupon/coupon-edit/coupon-edit.component.html
|
2 years ago |
|
袁野
|
8ce9fd755c
|
Merge branch 'dev' of http://139.159.177.244:3000/yuanye/high-web into dev
* 'dev' of http://139.159.177.244:3000/yuanye/high-web:
提交代码
提交代码
|
2 years ago |
|
袁野
|
943853cd9e
|
no message
|
2 years ago |
