Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dcs-doc-expand
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
INET-TWO
server
dcs-doc-expand
Commits
375364b9
Commit
375364b9
authored
Oct 30, 2024
by
wei
🎱
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reference数据库关键字,冲突。修改
parent
2f8dabe9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
ExtBorrowingFormVO.java
...a/com/inet/dcs/document/common/vo/ExtBorrowingFormVO.java
+2
-2
ExtBorrowingForm.java
...ava/com/inet/dcs/document/entity/po/ExtBorrowingForm.java
+1
-1
No files found.
inet-doc-expand-common/src/main/java/com/inet/dcs/document/common/vo/ExtBorrowingFormVO.java
View file @
375364b9
...
@@ -83,7 +83,7 @@ public class ExtBorrowingFormVO extends IdOnlyVO implements IdVO ,DxContextVOHol
...
@@ -83,7 +83,7 @@ public class ExtBorrowingFormVO extends IdOnlyVO implements IdVO ,DxContextVOHol
public
static
final
String
EXPECTED_RETURN_TIME_PROP_NAME
=
"expectedReturnTime"
;
public
static
final
String
EXPECTED_RETURN_TIME_PROP_NAME
=
"expectedReturnTime"
;
public
static
final
String
EXT_BORROWING_DOC_LINKS_PROP_NAME
=
"extBorrowingDocLinks"
;
public
static
final
String
EXT_BORROWING_DOC_LINKS_PROP_NAME
=
"extBorrowingDocLinks"
;
public
static
final
String
FILE_NAME_PROP_NAME
=
"fileName"
;
public
static
final
String
FILE_NAME_PROP_NAME
=
"fileName"
;
public
static
final
String
REFERENCE_PROP_NAME
=
"r
eference"
;
public
static
final
String
FILE_REFERENCE_PROP_NAME
=
"fileR
eference"
;
public
static
final
String
RETURN_SITUATION_DESCRIPTION_PROP_NAME
=
"returnSituationDescription"
;
public
static
final
String
RETURN_SITUATION_DESCRIPTION_PROP_NAME
=
"returnSituationDescription"
;
/**
/**
...
@@ -221,7 +221,7 @@ public class ExtBorrowingFormVO extends IdOnlyVO implements IdVO ,DxContextVOHol
...
@@ -221,7 +221,7 @@ public class ExtBorrowingFormVO extends IdOnlyVO implements IdVO ,DxContextVOHol
/**
/**
* 档号
* 档号
*/
*/
private
String
r
eference
;
private
String
fileR
eference
;
/**
/**
* 归还情况说明
* 归还情况说明
...
...
inet-doc-expand-entity/src/main/java/com/inet/dcs/document/entity/po/ExtBorrowingForm.java
View file @
375364b9
...
@@ -141,7 +141,7 @@ public class ExtBorrowingForm extends IdOnlyEntity implements DxContextHolder ,D
...
@@ -141,7 +141,7 @@ public class ExtBorrowingForm extends IdOnlyEntity implements DxContextHolder ,D
/**
/**
* 档号
* 档号
*/
*/
private
String
r
eference
;
private
String
fileR
eference
;
/**
/**
* 归还情况说明
* 归还情况说明
*/
*/
...
...
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