Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

src/pages/platformCenter/messageManage/projectManage/ProjectManage.jsx

@@ -186,6 +186,10 @@ const ProjectManage = props => {
       render: record => {
         if (record === '1') {
           return <Tag color="success">是</Tag>;
+        } else if (record === '是') {
+          return <Tag color="success">是</Tag>;
+        } else if (record === '否') {
+          return <Tag color="processing">否</Tag>;
         }
         return <Tag color="processing">否</Tag>;
       },

src/pages/platformCenter/messageManage/templateManage/components/AddModal.jsx

@@ -241,7 +241,7 @@ const AddModal = props => {
           <Item label="模板参数(仅针对2.0规则)" labelCol={{ span: 6 }} name="params">
             <TextArea rows={2} style={{ width: '95%' }} placeholder="first|Second|Third|Four" />
           </Item>
-          <Item label="解析参数(仅针对2.0规则)" labelCol={{ span: 6 }} name="param1">
+          <Item label="API解析参数(仅针对2.0规则)" labelCol={{ span: 6 }} name="param1">
             <TextArea rows={2} style={{ width: '95%' }} placeholder="first|Second|Third|Four" />
           </Item>
           <Item label="参数说明" name="desc" labelCol={{ span: 6 }}>

src/pages/platformCenter/messageManage/templateManage/components/EditModal.jsx

@@ -251,7 +251,7 @@ const EditModal = props => {
           <Item label="模板参数(仅针对2.0规则)" labelCol={{ span: 6 }} name="params">
             <TextArea rows={2} style={{ width: '95%' }} placeholder="first|Second|Third|Four" />
           </Item>
-          <Item label="解析参数(仅针对2.0规则)" labelCol={{ span: 6 }} name="param1">
+          <Item label="API解析参数(仅针对2.0规则)" labelCol={{ span: 6 }} name="param1">
             <TextArea rows={2} style={{ width: '95%' }} placeholder="first|Second|Third|Four" />
           </Item>
           <Item label="参数说明" labelCol={{ span: 6 }} name="desc">