Merge remote-tracking branch 'origin/master'

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/circulation2/controller/GwCirculationCard2Controller.java

@@ -113,9 +113,6 @@ public class GwCirculationCard2Controller {
 
 			if(state!=null&&!state.equals("null")&&!state.equals("")){
 				queryWrapper.eq ("a.state", state );
-				if(!state.equals("1")){
-					queryWrapper.eq ("b.state", state );
-				}
 				if(state.equals("4")){
 					queryWrapper.ne ("b.state", "1" );
 				}