update

Conversation 0 Commits 2 Files Changed 35

p4vsywzlp commented

Owner

There is no content yet.

p4vsywzlp added 2 commits

2a5310d522 update

56521ce0d3 Merge remote-tracking branch 'remotes/origin/main' into developer

# Conflicts:
#	Supermarket/bin/com/lingnan/supermarket/componet/BGPanel.class
#	Supermarket/bin/com/lingnan/supermarket/dao/impl/storageRecordImpl.class
#	Supermarket/bin/com/lingnan/supermarket/utils/CreateOrder.class
#	Supermarket/bin/com/lingnan/supermarket/utils/JDBCUtil.class
#	Supermarket/bin/com/lingnan/supermarket/utils/TimeAndOrder.class
#	Supermarket/bin/com/lingnan/supermarket/view/InView.class
#	Supermarket/bin/com/lingnan/supermarket/view/MainView.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 merged commit f7fe585506 into main 1 year ago

p4vsywzlp referenced this issue from a commit

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

The pull request has been merged as f7fe585506.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: p4vsywzlp/test#49

update #49