Merge remote-tracking branch 'origin/master'

2025-03-19 10:43:07 +08:00
parent ef1841e256 2b292897d2
commit cecbe4252e
12 changed files with 180 additions and 14 deletions
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzPayCalculation.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzPayCalculation.java
@ -88,7 +88,7 @@ public class WgzPayCalculation implements Serializable {

    /** 务工状态 */
    @Excel(name = "务工状态")
-    @ApiModelProperty("务工状态")
+    @ApiModelProperty("务工状态(1进场 2离场)")
    private String workingState;

    /** 联系电话 */