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

src/custom/restcontroller/sale/creditbill/creditbill.java

@@ -266,7 +266,7 @@ public class creditbill extends Controller {
                         // content.put("sa_creditbillid", sa_creditbillid);
                         sqlList.add(sqlFactory.getSQL());
                     } else {
-                        sqlList.add("update sa_accountbalance set creditquota=creditquota+" + creditquota
+                        sqlList.add("update sa_accountbalance set creditquota=" + creditquota
                                 + ",changedate=CURRENT_TIME,changeby ='" + username + "',changeuserid='" + userid
                                 + "' where sys_enterpriseid ='" + sys_enterpriseid + "' and  sa_accountclassid='"
                                 + sa_accountclassid + "' and siteid='" + siteid + "'");