Merge branch 'master' of http://113.105.137.151:22280/chan/xxmp

# Conflicts:
#	addons/longbing_company/inc/wxapp/make.inc.php

addons/longbing_company/inc/wxapp/make.inc.php

@@ -54,7 +54,7 @@ LEFT JOIN ims_longbing_company_goods g ON m.good_id=g.id
 WHERE  m.isdel=0 and m.user_id=$user_id and m.uniacid=$uniacid ";
 $lists=pdo_fetchall($sql);
 $count=count($lists);
-$sql.=" ORDER BY desc m.cre_time LIMIT $page,$size";
+$sql.=" ORDER BY m.cre_time desc LIMIT $page,$size";
 $list=pdo_fetchall($sql);
 $data = array('page' => $curr, 'total_page' => ceil($count / 10), 'list' => $list,'url'=>$_W['siteroot'] . $_W['config']['upload']['attachdir'] . '/');