Merge remote-tracking branch 'remotes/origin/developer' into branch_cwf
# Conflicts:
# Supermarket/.idea/dataSources/5b23e521-053a-47c0-ae28-a98b513bc6ec.xml
# Supermarket/bin/.idea/dataSources/5b23e521-053a-47c0-ae28-a98b513bc6ec.xml
# Supermarket/bin/com/lingnan/supermarket/componet/BGPanel.class
# Supermarket/bin/com/lingnan/supermarket/dao/impl/inOrderServiceImpl.class
# Supermarket/bin/com/lingnan/supermarket/dialog/UserDialog$MyItemListener.class
# Supermarket/bin/com/lingnan/supermarket/dialog/UserDialog.class
# Supermarket/bin/com/lingnan/supermarket/dialog/UserInfDialog$MyItemListener.class
# Supermarket/bin/com/lingnan/supermarket/dialog/UserInfDialog.class
# Supermarket/bin/com/lingnan/supermarket/view/InView.class
# Supermarket/bin/com/lingnan/supermarket/view/MainView.class
# test.txt
|