UML_CLASS
UML_CLASS
OAuthAccount
OAuthAccount
entity 更新
新增優惠Model
Merge remote-tracking branch 'origin/hongjie.wu'

Conflicts:
	FoodBox/src/sample/entity/Store.java
	FoodBox/src/sample/entity/StoreTest.java
	foodbox/src/base/entity/Supplier.java
	foodbox/src/base/entity/SupplierSite.java
	foodbox/src/base/entity/SupplierSiteAccount.java
	foodbox/src/sample/entity/Store.java