任务 8612 任务 8695

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/SignDto.java

@@ -41,7 +41,7 @@ public class SignDto  extends BaseDto {
 
     @ExcelIgnore
     @ApiModelProperty(value = "打卡人id")
-    private String userId;
+    private String signUserId;
 
     @ExcelProperty(value = "岗位", index = 2)
     @ApiModelProperty(value = "打卡人岗位")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/Sign.java

@@ -32,7 +32,7 @@ public class Sign extends BaseEntity {
      * 打卡人id
      */
 	@TableField("user_id")
-    private String userId;
+    private String signUserId;
 
     /**
      * 打卡人岗位

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/SignMapper.xml

@@ -9,7 +9,7 @@
         sign.`sequence_nbr` sequenceNbr,
         sign.name ,
         sign.`job_title` jobTitle,
-        sign.`user_id` categoryName,
+        sign.`user_id` signUserId,
         sign.type ,
         sign.`biz_org_code` bizOrgCode,
         sign.`biz_org_name` bizOrgName,