Merge remote-tracking branch 'origin/master'

yujian

2019-01-24 1b1f8fb628c08fc757139a34e2293db8d2529092

 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;