Merge remote-tracking branch 'origin/master'

sgj

昨天 ef7cde2fb1f44de1ffa8b961ee1732fb327e1cd4

 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();