Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

liujie

8 天以前 3a0bef313cbc6cd71bcb234d208805c022827e13

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tInvoice/tInvoice.js

@@ -75,13 +75,13 @@
            formatter: function (value, row) {
                var btn = "";
                if('' != row.remark && typeof row.remark != "undefined"){
                    btn + "备注说明：" + row.remark + "\n"
                    btn += "备注说明：" + row.remark + "\n"
                }
                if('' != row.address && typeof row.address != "undefined"){
                    btn + "地址和电话：" + row.address + "\n"
                    btn += "地址和电话：" + row.address + "\n"
                }
                if('' != row.bank && typeof row.bank != "undefined"){
                    btn + "开户行和账号：" + row.bank + "\n"
                    btn += "开户行和账号：" + row.bank + "\n"
                }
                return btn;
            }