Merge remote-tracking branch 'origin/develop' into develop

src/custom/restcontroller/webmanage/sale/sendplan/sendplandetail.java

@@ -234,7 +234,7 @@ public class sendplandetail extends Controller {
                 sqlFactory.addParameter("changedate", getDateTime_Str());
                 sqlFactory.addParameter("checkby", "");
                 sqlFactory.addParameter("checkdate","null");
-                sqlFactory.addParameter("remarks", "由发货计划自动生成" + key);
+                sqlFactory.addParameter("remarks", "");
                 sqlList.add(sqlFactory.getSQL());
 
                 int rowno = 1;