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
|
HouXinyu