Merge remote-tracking branch 'refs/remotes/origin/master' into zf1

zhangf

2024-06-24 9289aa181144778637d18a3f727663a10b5195cc

 exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/query/TrainingInstitutionQuery.java

@@ -23,4 +23,6 @@
   //区划编码
   @ApiModelProperty(value = "区划编码")
   private String districtCode;

   private Long userId;
}