Merge branch 'master' into positec

king

2023-08-16 7e46c386be5c2cfc20af3936d26839ad3fce44b0

 src/templates/sharecomponent/actioncomponent/verifyexcelout/customscript/index.jsx

@@ -266,7 +266,7 @@
          </Col>
          <Col span={10}>
            <Form.Item label="报错字段" style={{margin: 0, whiteSpace: 'nowrap'}}>
              ErrorCode（增加后缀NT表示数据不回滚，如ENT、NNT、FNT、NMNT）, retmsg
              ErrorCode（增加后缀NT表示数据不回滚，如ENT、NNT、FNT、NMNT、CNT、-2NT）, retmsg
            </Form.Item>
          </Col>
          <Col span={24} className="sqlfield">