Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-13 ca81ac257960fcb135fe542a49c28bc871b14e2a

1
2
3
4
5
6
7
8
9
10
11
12
13
package com.yeshi.fanli.entity.taobao; 
 
import com.yeshi.fanli.dto.HongBao; 
 
public class TaobaoOrderHongBao { 
    public HongBao hongBao; 
    public TaoBaoOrder taoBaoOrder; 
 
    public TaobaoOrderHongBao(HongBao hongBao, TaoBaoOrder taoBaoOrder) { 
        this.hongBao = hongBao; 
        this.taoBaoOrder = taoBaoOrder; 
    } 
}