Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0

mitao

2025-03-18 d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightResourceSharingDTO.java

@@ -20,6 +20,9 @@
    @ApiModelProperty("单位id")
    private String unitId;

    @ApiModelProperty("单位名称")
    private String unitName;

    @ApiModelProperty("项目id")
    private String meritId;