Merge remote-tracking branch 'origin/master'

sgj

2026-01-05 7b973b3b9b723f48c54f2c0c5083886573224541

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