Merge remote-tracking branch 'origin/master'

czt

4 天以前 b1e6bf7d3ed1a1d64182127f83fdc3fad2233a7e

 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java

@@ -18,7 +18,7 @@

        private String userId;

        private String batchId;
        private String confId;

    public PatrolKey(){
            super();