Merge remote-tracking branch 'origin/master'

data/rw_database.sql

@@ -10966,6 +10966,17 @@ CREATE TABLE `yoshop_unit` (
   `update_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COMMENT='计量单位表';
+INSERT INTO `yoshop_unit` (`id`, `name`, `sort`, `create_time`, `update_time`) VALUES ('1', '件', '0', '1540194026', '1540194026');
+INSERT INTO `yoshop_unit` (`id`, `name`, `sort`, `create_time`, `update_time`) VALUES ('2', '盒', '0', '1540194026', '1540194026');
+INSERT INTO `yoshop_unit` (`id`, `name`, `sort`, `create_time`, `update_time`) VALUES ('3', '包', '0', '1540194026', '1540194026');
+INSERT INTO `yoshop_unit` (`id`, `name`, `sort`, `create_time`, `update_time`) VALUES ('4', '份', '0', '1540194026', '1540194026');
+INSERT INTO `yoshop_unit` (`id`, `name`, `sort`, `create_time`, `update_time`) VALUES ('5', '箱', '0', '1540194026', '1540194026');
+INSERT INTO `yoshop_unit` (`id`, `name`, `sort`, `create_time`, `update_time`) VALUES ('6', '袋', '0', '1540194026', '1540194026');
+INSERT INTO `yoshop_unit` (`id`, `name`, `sort`, `create_time`, `update_time`) VALUES ('7', '斤', '0', '1540194026', '1540194026');
+INSERT INTO `yoshop_unit` (`id`, `name`, `sort`, `create_time`, `update_time`) VALUES ('8', '桶', '0', '1540194026', '1540194026');
+INSERT INTO `yoshop_unit` (`id`, `name`, `sort`, `create_time`, `update_time`) VALUES ('9', '瓶', '0', '1540194026', '1540194026');
+INSERT INTO `yoshop_unit` (`id`, `name`, `sort`, `create_time`, `update_time`) VALUES ('10', '罐', '0', '1540194026', '1540194026');
+INSERT INTO `yoshop_unit` (`id`, `name`, `sort`, `create_time`, `update_time`) VALUES ('11', '个', '0', '1540194026', '1540194026');
 
 -- ----------------------------
 -- Records of yoshop_unit