Merge branch 'master' of https://gitee.com/zyjzjs/g0b1vetx-board

# Conflicts:
#	Board/data.c
#	Board/data.h
#	Board/di-board.c
#	Board/di-board.h
#	MDK-ARM/GB01VETx.uvguix.Memory

Board/di-board.h

@@ -5,7 +5,11 @@ typedef enum DIState_t
 {
 	DI_HIGH = 1,
 	DI_LOW = 0
+<<<<<<< HEAD
 } DIState_t;
+=======
+}DIState_t;	
+>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
 
 void DiInit (void);
 DIState_t MX_Din_Pull (int chann);