Commits · bbac95108240feba617f9e396d35041045a4069e · 张杰 / Opple-iOS

21 Nov, 2016 2 commits
- 修改项说明： · bbac9510
  曹云霄 authored Nov 21, 2016
  
  bbac9510
- 修改项说明：优化促销条件冲突控制，优先级控制 · 7ba8658e
  曹云霄 authored Nov 21, 2016
  
  7ba8658e
18 Nov, 2016 3 commits
- 修改项说明：完成微信卡劵促销，完成促销优先级，完成促销冲突判定 · 3a578a82
  曹云霄 authored Nov 18, 2016
  
  3a578a82
- Merge branch 'master' into WXCard · 2cda6688
  曹云霄 authored Nov 18, 2016
```
# Conflicts:
#	Class/CustomerOrderViewController.m
#	Class/OrderdetailsViewController.h
#	Class/OrderdetailsViewController.m
```
  2cda6688
- 修改项说明：修复未选中当前客户时，促销查询错误 · 3241f8a1
  曹云霄 authored Nov 18, 2016
  
  3241f8a1
17 Nov, 2016 2 commits
- 修改项说明：修复从订单列表进入订单详情抽奖时，导购促销和消费者促销错乱 · ac511240
  曹云霄 authored Nov 17, 2016
  
  ac511240
- Merge branch 'master' into WXCard · 54c5c4e2
  曹云霄 authored Nov 17, 2016
```
# Conflicts:
#	Class/OrderdetailsViewController.m
```
  54c5c4e2
16 Nov, 2016 4 commits
- 修改项说明：打包1.2.1正式 · ab139e43
  曹云霄 authored Nov 16, 2016
  
  ab139e43
- 修改项说明：已抽奖未使用，在此使用同样需要满足当时促销条件 · a780cc70
  曹云霄 authored Nov 16, 2016
  
  a780cc70
- 修改项说明： · 9a73f9c8
  曹云霄 authored Nov 16, 2016
  
  9a73f9c8
- 修改项说明：修改促销机制，统一选择 · 4da09d93
  曹云霄 authored Nov 16, 2016
  
  4da09d93
14 Nov, 2016 2 commits
- 修改项说明：消费者促销区分优先级开发 · 4504075d
  曹云霄 authored Nov 14, 2016
  
  4504075d
- 修改项说明：优化 · b264ee99
  曹云霄 authored Nov 14, 2016
  
  b264ee99
11 Nov, 2016 5 commits
- 修改项说明：修复提示框 · c2f0580c
  曹云霄 authored Nov 11, 2016
  
  c2f0580c
- 修改项说明：jenkins · 741c7c85
  曹云霄 authored Nov 11, 2016
  
  741c7c85
- 修改项说明：优化 · f0c7e202
  曹云霄 authored Nov 11, 2016
  
  f0c7e202
- 修改项说明：优化抽奖机会提示，协调和卡劵提示的关系 · ceb5b36e
  曹云霄 authored Nov 11, 2016
  
  ceb5b36e
- 修改项说明： · 63f30440
  曹云霄 authored Nov 11, 2016
  
  63f30440
10 Nov, 2016 11 commits
- 修改项说明：修复打印URL问题 · c896772f
  曹云霄 authored Nov 10, 2016
  
  c896772f
- 修改项说明：debug · e99978ff
  曹云霄 authored Nov 10, 2016
  
  e99978ff
- 修改项说明： · ed21b615
  曹云霄 authored Nov 10, 2016
  
  ed21b615
- 修改项说明：优化无促销情况不主动提示支付 · a4dd6aae
  曹云霄 authored Nov 10, 2016
  
  a4dd6aae
- Merge branch 'master' of https://git.oschina.net/gomore/Opple-iOS · dd372597
  曹云霄 authored Nov 10, 2016
```
# Conflicts:
#	Class/SettlementViewController.m
```
  dd372597
- 修改项说明： · 527575c6
  曹云霄 authored Nov 10, 2016
  
  527575c6
- 修改项说明： · 9844f349
  曹云霄 authored Nov 10, 2016
  
  9844f349
- 修改项说明： · ac6cf0f4
  曹云霄 authored Nov 10, 2016
  
  ac6cf0f4
- 修改项说明：修复搜索闪退、促销价格大于商品总价 · d91fb208
  曹云霄 authored Nov 10, 2016
  
  d91fb208
- 修改项说明：公告 · 51f011b5
  曹云霄 authored Nov 10, 2016
  
  51f011b5
- 修改项说明：优化打印 · 968d8665
  曹云霄 authored Nov 10, 2016
  
  968d8665
09 Nov, 2016 5 commits
- 修改项说明： · c9c85863
  曹云霄 authored Nov 09, 2016
  
  c9c85863
- 修改项说明：jenkins · 52acd7e8
  曹云霄 authored Nov 09, 2016
  
  52acd7e8
- Merge branch 'luckyDraw' · 3c3b2f9b
  曹云霄 authored Nov 09, 2016
  
  3c3b2f9b
- 修改项说明：抽奖优化 · ea83a676
  曹云霄 authored Nov 09, 2016
  
  ea83a676
- 修改项说明：导购抽奖、客户抽奖 · 38cc7ea4
  曹云霄 authored Nov 09, 2016
  
  38cc7ea4
04 Nov, 2016 1 commit
- 修改项说明：storyboard分类 · a44ffd28
  曹云霄 authored Nov 04, 2016
  
  a44ffd28
03 Nov, 2016 3 commits
- 修改项说明：自动构建修改证书、描述文件 · 9564f01e
  曹云霄 authored Nov 03, 2016
  
  9564f01e
- 修改项说明：抽奖，京东E卡优化 · 1c8a5b36
  曹云霄 authored Nov 03, 2016
  
  1c8a5b36
- 准备新建抽奖分支 · 43e28d0d
  曹云霄 authored Nov 03, 2016
  
  43e28d0d
02 Nov, 2016 1 commit
- 卡劵改动 · cef9c44f
  曹云霄 authored Nov 02, 2016
  
  cef9c44f
28 Oct, 2016 1 commit
- debug · bae556a2
  曹云霄 authored Oct 28, 2016
  
  bae556a2