Merge branch 'master' of http://192.168.0.88:53000/SisMaker/genProto

src/writeErl/gErlGen.erl

@@ -20,7 +20,7 @@ protoErlHeader() ->
 <<"-module(protoMsg).\n\n
 -compile([nowarn_unused_vars]).
 
--export([encodeIol/1, encodeBin/1,  encodeIol/2, subEncode/1, subEncode/2, decode/1,  decodeBin/2]).
+-export([encodeIol/1, encodeBin/1,  encodeIol/2, subEncode/1, subEncode/2, decode/1,  decodeBin/2, getMsgName/1]).
 
 -define(min8, -128).
 -define(max8, 127).

src/writeLua/ByteArray.lua

@@ -21,7 +21,7 @@ function ByteArray(endian)
 		fmt = fmt or ""
 		if BA_ENDIAN_LITTLE == mEndian then
 			return "<"..fmt
-		elseif BA_ENDIAN_BIG == mEndianthen then
+		elseif BA_ENDIAN_BIG == mEndian then
 			return ">"..fmt
 		else
 			return "="..fmt