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
|
“郑亦歆”
Redmi