Merge remote-tracking branch 'origin/master'

zzw

2023-11-20 2f7e7ad6c61ac3f239a4e9a87cde634a9c3fcf00

 modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironHardwareResources.java

@@ -31,7 +31,7 @@
   private String itemName;

   @ApiModelProperty(value = "用途")
   private String usage;
   private String purposes;

   @ApiModelProperty(value = "状态")
   private String state;