Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sz/sz_his_api_controller.go

@@ -15,7 +15,6 @@ import (
 	"strconv"
 	"strings"
 	//"strings"
-	"golang.org/x/text/encoding/simplifiedchinese"
 	"syscall"
 	"time"
 	"unsafe"