Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-01-05 2d4cbcc4f92edbc4f926d9710bdda64520039c2b

 src/app/core/entity/grid.ts

@@ -13,7 +13,7 @@
   sort?: string;
   isSort?: boolean;
   type?: DataType;
   format?: Function;
   format?: (value: any, col: Column, row: any) => string;
}
export interface DataType {
    name: Types;