总经理制定策略界面50%
Merge branch 'master' of
ssh://git@github.com/minusone13/InvoicingSystem.git

Conflicts:
	LevelStrategyPO.txt
	ReachStrategyPO.txt
	Stock.ser
	User.ser
	src/main/java/userui/TestFrame.java