Merge branch 'feature/add_item' of wmtx/platform into release

押金bug修正

Application/Admin/View/CompanyStatementPool/editPuPool.html

@@ -419,6 +419,9 @@
         if (!refund  || refund < 0) {
             refund = 0;
             $(_this).parent().parent().find(".refund").val(refund);
+        } else if(parseFloat(refund) > parseFloat(pay_money)) {
+          refund = pay_money;
+          $(_this).parent().parent().find(".refund").val(refund);
         }
         //补点
         var increment_ratio = $(_this).parent().parent().find(".increment_ratio").val();

Data/update.sql

@@ -2535,6 +2535,9 @@ ALTER TABLE `tab_settleup_marketorder`
 DROP COLUMN `company_name`,
 ADD COLUMN `company_name` varchar(50) NULL DEFAULT '' COMMENT '公司名称' AFTER `company_id`;
 
+ALTER TABLE `tab_company_lack_statement_info`
+ADD COLUMN `remark` varchar(255) NULL DEFAULT '' COMMENT '备注' AFTER `withdraw_type`;
+
 CREATE TABLE `tab_aggregate_lack_statement_info`  (
   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增主键',
   `company_id` int(11) NULL DEFAULT 0 COMMENT '对账公司id',