Merge branch 'div'

yujian

2019-01-29 eb9da1ad5c4054d9ce3dab2446deade9f5b09c7d

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/OrderItem.java

@@ -3,6 +3,7 @@
import java.math.BigDecimal;



import javax.persistence.Entity;

import javax.persistence.FetchType;

import javax.persistence.GeneratedValue;

import javax.persistence.GenerationType;

import javax.persistence.Id;