Merge branch 'master' of http://10.0.41.100:3000/SoftwareDevelopers/gunshi-project-xyt

src/main/java/com/gunshi/project/xyt/model/StWaterRReal.java

@@ -63,6 +63,10 @@ public class StWaterRReal implements Serializable {
         // @Size(max = 0,message = "水量最大长度要小于 0")
         private String v;
 
+        // 站类
+        @TableField(exist = false)
+        private String sttp;
+
         // 月核定流量
         @TableField(exist = false)
         private ResMonthEcoFlow resMonthEcoFlow;