Merge remote-tracking branch 'origin/master'

liusheng

2025-09-25 a7f132bc723df88c95b469260eb79ac247463442

 smartor/src/main/java/com/smartor/domain/ServiceSubtaskCount.java

@@ -32,10 +32,16 @@
    private Long count;

    @ApiModelProperty(value = "填写满意度数量")
    private Long joyCount;
    private Integer joyCount;

    @ApiModelProperty(value = "所有满意度数量")
    private Long joyAllCount;
    private Integer joyAllCount;

    @ApiModelProperty(value = "满意度比例")
    private String joyTotal;

    @ApiModelProperty(value = "满意度名称")
    private String joyName;

    public ServiceSubtaskCount(String month, Long serviceType, Long count) {
        this.serviceType = serviceType;