Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2024-01-20 987c88b4279a2592ff621b36d8597286258bd0d5

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/AttResBaseGeneralInvestigationVO.java

@@ -14,4 +14,7 @@
   private static final long serialVersionUID = 1L;

   private String tbState;//填报状态

   private String adCode;//行政编码

}