Signed-off-by: zyh <yuanh@ccabot.com>
Merge branch 'master' of https://github.com/ebspos/ebspos
Signed-off-by: zyh <yuanh@ccabot.com>
Merge branch 'master' of https://github.com/ebspos/ebspos
修改设计说明书
Merge branch 'master' of https://github.com/ebspos/ebspos

Conflicts:
	src/com/ebspos/cg/controller/CgorderController.java
	src/com/ebspos/pay/controller/JhpayController.java