Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui

# Conflicts: # pluss-manage-page/src/main/resources/application-dev.yml
2023-06-03 09:24:28 +08:00
parent 3c6085805f c29c10c193
commit fffecb1535
18 changed files with 732 additions and 194 deletions
--- a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/userAppList.jsp
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/userAppList.jsp
@@ -571,7 +571,7 @@
                    minWidth: 160,
                    templet: '#extensionThirdStatus',
                    rowspan: 1,
-                    colspan: 3
+                    colspan: 4
                }
                , {
                    title: 'D1微信子商户号<hr/>支付宝子商户号',
@@ -671,7 +671,17 @@
                    templet: function (r) {
                        return thirdStatus(r.channelStatusList, r.ppStatus, r.ppThirdStatus, 4);
                    }
-                }
+                },
+                    {
+                        field: 'mcs4Status',
+                        title: '拉卡拉',
+                        align: "left",
+                        width: 190,
+                        rowspan: 1,
+                        templet: function (r) {
+                            return thirdStatus(r.channelStatusList, r.ppStatus, r.ppThirdStatus, 5);
+                        }
+                    }
                ]
            ],
            done: function (index, layero) {