Merge remote-tracking branch 'origin/master'

zzw

2023-11-20 2c89ccdc9e008060f8cd6608c9fcb014616987a3

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

@@ -26,8 +26,8 @@
   @ApiModelProperty(value = "编号")
   private String code;

   @ApiModelProperty(value = "委托单ID")
   private Long orderId;
   @ApiModelProperty(value = "项目ID")
   private Long projectId;

   @ApiModelProperty(value = "硬软件资源")
   private String hardSoftwareRes;