Labels Milestones

all #52

Closed

pxeyinm2q wants to merge 5 commits from main into developer

pull from: main

merge into: p4vsywzlp:developer

p4vsywzlp:developer

p4vsywzlp:branch_sgl

p4vsywzlp:branch_zyx

p4vsywzlp:branch_cwf

Conversation 0 Commits 5 Files Changed 63

pxeyinm2q commented 1 year ago

Collaborator

There is no content yet.

pxeyinm2q added 6 commits 1 year ago

f7fe585506 Merge pull request 'update' (#49) from developer into main

070f2a5274 new

57f8f74053 t1

286a3d9786 t2

b319190310 t3

979b0b099e Merge branch '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

pxeyinm2q 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

1 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#52

Write Preview

Loading…

Cancel

Save

There is no content yet.