Browse Source

chore: auto bump version and changelog [skip ci]

iwt 1 month ago
parent
commit
43d5c2e71d

+ 1 - 25
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminSettlementController.java

@@ -1,6 +1,7 @@
 package com.etotem.cfc.controller.admin;
 
 import com.etotem.cfc.common.Result;
+import com.etotem.cfc.dto.SettlementStats;
 import com.etotem.cfc.entity.ServiceSettlement;
 import com.etotem.cfc.service.DanSettlementService;
 import org.springframework.web.bind.annotation.*;
@@ -77,28 +78,3 @@ class SettlementListRequest {
     public String getProviderType() { return providerType; }
     public void setProviderType(String providerType) { this.providerType = providerType; }
 }
-
-/**
- * 结算统计数据
- */
-class SettlementStats {
-    private Long totalAmount; // 总金额(分)
-    private Long pendingAmount; // 待结算金额(分)
-    private Long settledAmount; // 已结算金额(分)
-    private Integer totalCount; // 总笔数
-    private Integer pendingCount; // 待结算笔数
-    private Integer settledCount; // 已结算笔数
-
-    public Long getTotalAmount() { return totalAmount; }
-    public void setTotalAmount(Long totalAmount) { this.totalAmount = totalAmount; }
-    public Long getPendingAmount() { return pendingAmount; }
-    public void setPendingAmount(Long pendingAmount) { this.pendingAmount = pendingAmount; }
-    public Long getSettledAmount() { return settledAmount; }
-    public void setSettledAmount(Long settledAmount) { this.settledAmount = settledAmount; }
-    public Integer getTotalCount() { return totalCount; }
-    public void setTotalCount(Integer totalCount) { this.totalCount = totalCount; }
-    public Integer getPendingCount() { return pendingCount; }
-    public void setPendingCount(Integer pendingCount) { this.pendingCount = pendingCount; }
-    public Integer getSettledCount() { return settledCount; }
-    public void setSettledCount(Integer settledCount) { this.settledCount = settledCount; }
-}

+ 1 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/dan/DanAssessmentExecutionController.java

@@ -5,6 +5,7 @@ import com.etotem.cfc.config.JwtConfig;
 import com.etotem.cfc.dto.ExecutionDetailResponse;
 import com.etotem.cfc.dto.ServiceRateRequest;
 import com.etotem.cfc.entity.DanAssessmentExecution;
+import com.etotem.cfc.entity.ServiceRating;
 import com.etotem.cfc.service.DanAssessmentExecutionService;
 import org.springframework.web.bind.annotation.*;
 

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-71bffd4fb5661bbee5e546340d0cb5bb8e024b57
+baf95f9e6ec503e946d28df73223b33eeabe5712

+ 1 - 1
cfc-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfc-web",
-  "version": "1.0.530",
+  "version": "1.0.531",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

+ 6 - 0
cfc-web/public/CHANGELOG-v1.0.md

@@ -4,6 +4,12 @@
 
 ---
 
+## v1.0.531 (2026-07-25)
+
+### 其他
+- clean: remove deprecated turmeric_rewritten.html placeholder
+
+
 ## v1.0.530 (2026-07-25)
 
 ### 重构

+ 7 - 1
cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.530
+> 当前版本: v1.0.531
 
 ## 历史版本
 
@@ -8,6 +8,12 @@
 
 ---
 
+## v1.0.531 (2026-07-25)
+
+### 其他
+- clean: remove deprecated turmeric_rewritten.html placeholder
+
+
 ## v1.0.530 (2026-07-25)
 
 ### 重构