Authored by xuhongyun

Merge branch 'master' into dev-xuhongyun

... ... @@ -36,7 +36,7 @@ var g = new common.grid({
return htmlArr.join('');
}},
{display: "备注", width: '50%', render: function(item) {
{display: "洗涤说明", width: '50%', render: function(item) {
return "<p style='word-break:break-all;'>" + item.remark + "</p>";
}},
{display: "操作", render: function(item) {
... ...