提交
提交
Merge remote-tracking branch 'origin/master'

Conflicts:
	businesslogicservice/blservice/ExpenseBLService.java
	businesslogicservice/blservice/FinanceBLService.java
	businesslogicservice/blservice/PurchaseBLService.java
	businesslogicservice/blservice/SalesBLService.java
	businesslogicservice/blservice/StockBLService.java
	businesslogicservice/blservice/UserBLService.java
	presentation/accountui/AccountAddui.java
	presentation/accountui/AccountDeleteui.java
	presentation/accountui/AccountLookui.java
	presentation/accountui/AccountModifyui.java
	presentation/accountui/Accountui.java
	presentation/billui/Billui.java
	presentation/expenseui/Expenseui.java
	presentation/financeui/Paymentui.java
	presentation/financeui/Reciptui.java
	presentation/initialui/InitialClient.java
	presentation/initialui/InitialCommodity.java
	presentation/initialui/InitialNew.java
	presentation/initialui/Initialui.java
	presentation/loginui/Loginui.java
	presentation/recordui/Recordui.java
	presentation/strategyui/MessageStock.java
	presentation/strategyui/MessageStrategy.java
	presentation/strategyui/Strategyui.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	businesslogicservice/blservice/FinanceBLService.java