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

admin

2020-05-14 235921d820f29b04b1e82f6a6f0d4a1957a900ef

 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;

   }

	


}