Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
midjourney-proxy
Overview
Overview
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
徐少华
midjourney-proxy
Commits
0335d905
Commit
0335d905
authored
Apr 17, 2020
by
裴大威
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-rsy-1022629' into 'master'
fixbug1022629 See merge request rays/pcloud-book!633
parents
9f397c42
9c08bc35
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
CultivateBizImpl.java
.../com/pcloud/book/cultivate/biz/impl/CultivateBizImpl.java
+1
-1
No files found.
pcloud-service-book/src/main/java/com/pcloud/book/cultivate/biz/impl/CultivateBizImpl.java
View file @
0335d905
...
@@ -496,7 +496,7 @@ public class CultivateBizImpl implements CultivateBiz {
...
@@ -496,7 +496,7 @@ public class CultivateBizImpl implements CultivateBiz {
Integer
hour
=(-
cultivateRecord
.
getEnergyChange
())/
60
;
Integer
hour
=(-
cultivateRecord
.
getEnergyChange
())/
60
;
Integer
min
=(-
cultivateRecord
.
getEnergyChange
())%
60
;
Integer
min
=(-
cultivateRecord
.
getEnergyChange
())%
60
;
if
(
hour
>
0
)
{
if
(
hour
>
0
)
{
cultivateRecord
.
setRemark
(
"你已使用"
+
(-
cultivateRecord
.
getEnergyChange
())
+
"能量值点亮"
+
hour
+
"小时"
+
min
+
"分钟"
);
cultivateRecord
.
setRemark
(
"你已使用"
+
(-
cultivateRecord
.
getEnergyChange
())
+
"能量值点亮"
+
hour
+
"小时"
+
(
min
!=
0
?
min
+
"分钟"
:
""
)
);
}
else
{
}
else
{
cultivateRecord
.
setRemark
(
"你已使用"
+
(-
cultivateRecord
.
getEnergyChange
())
+
"能量值点亮"
+
min
+
"分钟"
);
cultivateRecord
.
setRemark
(
"你已使用"
+
(-
cultivateRecord
.
getEnergyChange
())
+
"能量值点亮"
+
min
+
"分钟"
);
}
}
...
...
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