Merge remote-tracking branch 'origin/master'

admin

2018-12-29 117bb1c6a02d99546dd4bf953aeec67b1ab3d94e

 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;