Merge remote-tracking branch 'origin/master'

admin

2019-03-01 bb688ff2b4b42bc440a8e7145f53e9030073fa6a

 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;