zhangyang/zhipuzi_pos_windows @ d7b7f45c0e8ab9491ea7e9b3a07647d6663fde82

zhangyang d7b7f45c0e Merge branch 'master' of https://gitserver.xunjoy.com/zhangyang/zhipuzi_pos_windows		%!s(int64=6) %!d(string=hai) anos
..
setup	ecc452a281 更新图标	%!s(int64=6) %!d(string=hai) anos
zhipuzi_pos_windows	d7b7f45c0e Merge branch 'master' of https://gitserver.xunjoy.com/zhangyang/zhipuzi_pos_windows	%!s(int64=6) %!d(string=hai) anos
zhipuzi_pos_windows_server	333b23136b 订单设置失败的弹框弄好了	%!s(int64=6) %!d(string=hai) anos