Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 ae3e722d471d7e844acd25f124a1fec42ac714a0

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

@@ -29,6 +29,9 @@
   public final static int STATE_VERFING = 0;

   public final static int STATE_PASS = 1;

   public final static int STATE_REJECT = 2;

	
	
   public final static int TYPE_TAOBAO = 1;



   @Id

   @GeneratedValue(strategy = GenerationType.AUTO)