Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

sql/update.sql

@@ -66,3 +66,6 @@ ADD COLUMN `push_tender`  varchar(1000) CHARACTER SET ascii NOT NULL DEFAULT ''
 
 ALTER TABLE `zh_s2b_proj`
 ADD COLUMN `filter_tender`  varchar(1000) CHARACTER SET ascii NOT NULL DEFAULT '' COMMENT '过滤标段' AFTER `merge_code`;
+
+ALTER TABLE `zh_category_value` ADD `sort` int(11) DEFAULT NULL COMMENT '排序' AFTER `value`;
+UPDATE `zh_category_value` SET `sort`=`id`;