Merge remote-tracking branch 'origin/div' into div

yujian

2020-05-14 6cb04a3c75f46001a55be402c6650d5600748dc7

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

@@ -70,7 +70,7 @@
   // 上上级关系状态

   @Transient

   private Boolean stateSuper;

   // 有效关系

	
   @Transient

   private Integer validState;



@@ -161,5 +161,5 @@
   public void setValidState(Integer validState) {

      this.validState = validState;

   }

	


}