解决冲突

src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts

@@ -77,12 +77,12 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
   initST() {
     this.columns = [
       {
-        title: '配置名称',
+        title: '模板名称',
         index: 'configName',
         width: '200px',
       },
       {
-        title: '配置类型',
+        title: '等级类型',
         render: 'configType',
         width: '200px',
 
@@ -93,7 +93,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
         width: '250px',
       },
       {
-        title: '关联合伙人范围',
+        title: '合伙人范围',
         render: 'partnerType',
         width: '200px',
       },
@@ -103,7 +103,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
         width: '200px',
       },
       {
-        title: '启用时间',
+        title: '生效时间',
         index: 'enableTime',
         width: '200px',
       },