Gitlink
/
forgeplus-react
0
0
Fork 37
Code Issues Pull Requests 5 Releases 1 Wiki Activity

资助激励功能合并 #2

Closed
qyzh1996 wants to merge 15 commits from qyzh1996/forgeplus-react:sponsor into develop
pull from: qyzh1996/forgeplus-react:sponsor
merge into: Gitlink:develop
Conversation 0 Commits 15 Files Changed 24 +3494 -290
qyzh1996 commented 2020-12-27 21:58:54 +08:00
First-time contributor
Copy Link

包含了一部分dev_bei分支的代码。合并时对应dev_bei的最新提交为57363291f1，该提交的日期为12月2日左右。

包含了一部分dev_bei分支的代码。合并时对应dev_bei的最新提交为57363291f1，该提交的日期为12月2日左右。
qyzh1996 added 487 commits 2020-12-27 21:58:54 +08:00
2f1bac24d5 Merge branch 'newVersion_forge' into dev_devOps 
# Conflicts:
#	src/forge/Main/Detail.js
15d3102c51 Merge branch 'newVersion_forge' into dev_devOps 
# Conflicts:
#	src/forge/Main/CoderRootDirectory.js
15bd20122a Merge branch 'newVersion_forge' into dev_devOps 
# Conflicts:
#	src/forge/Images/banner_list_old.png
#	src/forge/Main/list.css
8cee70c195 Merge branch 'newVersion_forge' into dev_devOps 
# Conflicts:
#	public/css/iconfont.css
#	public/css/iconfont.eot
#	public/css/iconfont.js
#	public/css/iconfont.json
#	public/css/iconfont.svg
#	public/css/iconfont.ttf
#	public/css/iconfont.woff
#	public/css/iconfont.woff2
b6dfe2cd4a Merge branch 'newVersion_forge' into dev_devOps 
# Conflicts:
#	src/forge/Main/Detail.js
62b99c7921 Merge branch 'dev_chain' of https://git.trustie.net/jasder/forgeplus-react into dev_devOps 
# Conflicts:
#	src/forge/Merge/UpdateMerge.js
#	src/forge/Order/Detail.js
#	src/forge/Order/OrderItem.js
#	src/forge/Order/order_form.js
qyzh1996 added 2 commits 2021-06-09 11:06:31 +08:00
baladiwei closed this pull request 2021-08-25 11:04:03 +08:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Gitlink/forgeplus-react#2
No description provided.
Delete Branch "qyzh1996/forgeplus-react:sponsor"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?