Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_protocol into master_test_gn

protos/MessageTypeProto.proto

@@ -887,6 +887,8 @@ enum MessageType{
 
 	EQUIP_UPLEVEL_REQUEST = 11848;//装备升星（云游商人）
 	EQUIP_UPLEVEL_RESPONSE = 11849;
+
+	PUSH_WELFARE_RESPONSE = 11850;//推送礼包
 // T 11900
     TRIGGER_EVENT_REQUEST   = 11900; //
     TRIGGER_EVENT_RESPONSE  = 11901;

protos/PlayerInfoProto.proto

@@ -834,4 +834,8 @@ import "CommonProto.proto";
 	message EquipUpLevelResponse{
 		optional bool result = 1;
 		optional Drop drop = 2;
+	}
+	//推送礼包推送
+	message PushWelfareResponse{
+		repeated int32 id = 1;
 	}