Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxiaoming
traffic-front
Commits
f6a94285
Commit
f6a94285
authored
Apr 16, 2019
by
Cheng C Yang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug 23451
parent
b2ffa029
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
0 deletions
+12
-0
OrganizationExtraDto.java
...c/taxtech/atms/dto/organization/OrganizationExtraDto.java
+5
-0
vat.json
atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json
+3
-0
vat.json
atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
+4
-0
vat-revenue-config.ctrl.js
.../dataImport/vat-revenue-config/vat-revenue-config.ctrl.js
+0
-0
No files found.
atms-api/src/main/java/pwc/taxtech/atms/dto/organization/OrganizationExtraDto.java
View file @
f6a94285
package
pwc
.
taxtech
.
atms
.
dto
.
organization
;
package
pwc
.
taxtech
.
atms
.
dto
.
organization
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
pwc.taxtech.atms.common.util.PwCIdSerialize
;
import
pwc.taxtech.atms.common.util.PwCIdSerialize
;
...
@@ -23,7 +24,9 @@ public class OrganizationExtraDto implements Serializable {
...
@@ -23,7 +24,9 @@ public class OrganizationExtraDto implements Serializable {
*
*
* @mbg.generated
* @mbg.generated
*/
*/
@JsonSerialize
(
using
=
PwCIdSerialize
.
class
)
@JsonSerialize
(
using
=
PwCIdSerialize
.
class
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
Long
id
;
private
Long
id
;
/**
/**
...
@@ -541,6 +544,7 @@ public class OrganizationExtraDto implements Serializable {
...
@@ -541,6 +544,7 @@ public class OrganizationExtraDto implements Serializable {
*
*
* @mbg.generated
* @mbg.generated
*/
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
Long
secondaryApprovalAmount
;
private
Long
secondaryApprovalAmount
;
/**
/**
...
@@ -574,6 +578,7 @@ public class OrganizationExtraDto implements Serializable {
...
@@ -574,6 +578,7 @@ public class OrganizationExtraDto implements Serializable {
*
*
* @mbg.generated
* @mbg.generated
*/
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
Long
issuedShares
;
private
Long
issuedShares
;
/**
/**
...
...
atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json
View file @
f6a94285
...
@@ -1984,5 +1984,7 @@
...
@@ -1984,5 +1984,7 @@
"FileExportSuccess"
:
"File Export Success"
,
"FileExportSuccess"
:
"File Export Success"
,
"FileExportFailed"
:
"File Export Failed"
,
"FileExportFailed"
:
"File Export Failed"
,
"InputAllMandatoryInfo"
:
"Please Input All The Mandatory Information"
,
"~MustBeEndOneApp"
:
"I Must be the End One, please!"
"~MustBeEndOneApp"
:
"I Must be the End One, please!"
}
}
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
View file @
f6a94285
...
@@ -2295,5 +2295,8 @@
...
@@ -2295,5 +2295,8 @@
"manyExport"
:
"批量导出"
,
"manyExport"
:
"批量导出"
,
"saveAndRefresh"
:
"保存并刷新"
,
"saveAndRefresh"
:
"保存并刷新"
,
"uploadProfileTable"
:
"上传利润表"
,
"uploadProfileTable"
:
"上传利润表"
,
"InputAllMandatoryInfo"
:
"请输入所有必填信息"
,
"~MustBeEndOneApp"
:
"我必须是最后一个!"
"~MustBeEndOneApp"
:
"我必须是最后一个!"
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/dataImport/vat-revenue-config/vat-revenue-config.ctrl.js
View file @
f6a94285
This diff is collapsed.
Click to expand it.
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