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

aix

2024-08-28 f142d48409503dfd6b11d7d414c0ee7ffa85eed5

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/RulesCondition.java

@@ -64,5 +64,5 @@
    * 固定值
    */
   @ApiModelProperty("固定值")
   private Double fixValue;
   private String fixValue;
}