Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
319d0e2f
Commit
319d0e2f
authored
Jun 16, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
e003a2a2
568ba070
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
TGzEmpInfo.java
...m/yifu/cloud/plus/v1/yifu/archives/entity/TGzEmpInfo.java
+2
-4
TGzOfferInfo.java
...yifu/cloud/plus/v1/yifu/archives/entity/TGzOfferInfo.java
+3
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TGzEmpInfo.java
View file @
319d0e2f
...
...
@@ -51,15 +51,13 @@ public class TGzEmpInfo extends BaseEntity {
@ExcelProperty
(
"主键"
)
@Schema
(
description
=
"主键"
)
private
String
id
;
/**
* 关联瓜子offerID
*/
@ExcelAttribute
(
name
=
"关联瓜子offerID"
,
isNotEmpty
=
true
,
errorInfo
=
"关联瓜子offerID不能为空"
,
maxLength
=
32
)
@NotBlank
(
message
=
"关联瓜子offerID不能为空"
)
@Length
(
max
=
32
,
message
=
"关联瓜子offerID不能超过32个字符"
)
@ExcelProperty
(
"关联瓜子offerID"
)
@Schema
(
description
=
"关联瓜子offerID"
)
private
String
offerId
;
private
Integer
offerId
;
/**
* 档案推送状态(0:待推送;1:已推送)
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TGzOfferInfo.java
View file @
319d0e2f
...
...
@@ -48,10 +48,11 @@ public class TGzOfferInfo extends BaseEntity {
/**
* 主键
*/
@TableId
(
type
=
IdType
.
A
SSIGN_ID
)
@TableId
(
type
=
IdType
.
A
UTO
)
@ExcelProperty
(
"主键"
)
@Schema
(
description
=
"主键"
)
private
String
id
;
private
Integer
id
;
/**
* 流程ID(瓜子推过来的主键)
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment