Labels Milestones

尝试合并 #53

Closed

m2fn43ypg wants to merge 0 commits from developer into main

pull from: developer

merge into: p4vsywzlp:main

p4vsywzlp:main

p4vsywzlp:branch_sgl

p4vsywzlp:branch_zyx

p4vsywzlp:branch_cwf

Conversation 0 Commits N/A Files Changed N/A

m2fn43ypg commented 1 year ago

Collaborator

There is no content yet.

m2fn43ypg added 2 commits 1 year ago

5d4eff34dc nn

723fa85afd Merge remote-tracking branch 'remotes/origin/main' into developer ...

# Conflicts:
#	Supermarket/bin/com/lingnan/supermarket/dao/impl/storageRecordImpl.class
#	Supermarket/bin/com/lingnan/supermarket/utils/JDBCUtil.class
#	Supermarket/bin/com/lingnan/supermarket/utils/TimeAndOrder.class
#	Supermarket/bin/com/lingnan/supermarket/view/InView$MyItemListener.class
#	Supermarket/bin/com/lingnan/supermarket/view/InView.class
#	Supermarket/src/com/lingnan/supermarket/dao/impl/storageRecordImpl.java
#	Supermarket/src/com/lingnan/supermarket/utils/CreateOrder.java
#	Supermarket/src/com/lingnan/supermarket/utils/JDBCUtil.java
#	Supermarket/src/com/lingnan/supermarket/utils/TimeAndOrder.java
#	Supermarket/src/com/lingnan/supermarket/view/InView.java

p4vsywzlp force-pushed developer from 723fa85afd to b319190310 1 year ago

m2fn43ypg closed this pull request 1 year ago

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels

No items

No Label

Milestone

Set milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

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: p4vsywzlp/test#53

Write Preview

Loading…

Cancel

Save

There is no content yet.