Merge remote-tracking branch 'origin/develop1.0' into develop1.0

z1415143022

2025-03-27 472bb19d8543deeb82007f55d722fe46894d7760

 zhitan-system/src/main/java/com/zhitan/model/domain/vo/ModelNodeIndexInfor.java

@@ -34,10 +34,9 @@
   */
  private String energyId;

  private String indexType;
  /**
   * 单位
   */
  private String unitId;

  private String indexType;
}