Merge branch 'branch20211008' of http://10.10.10.43:9090/income_payments/income_payments_client into xuqiubangeng1026

 Conflicts:
	src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
This commit is contained in:
zhaoxiao
2021-10-28 09:19:19 +08:00
21 changed files with 373 additions and 258 deletions
+1 -1
View File
@@ -113,7 +113,7 @@ const getContactsByCompany = (params) => getAction('/company/payContactsManageme
// 通过企业名称获取该企业下的联系人无权限接口
const getContactsByCompanyNoLimit = (params) => getAction('/company/payContactsManagement/queryByCompanyMeeting', params)
// 通过联系人id获取联系人信息
const getContactsById = (param) => getAction('/company/payContactsManagement/queryByIdMeeting', param)
const getContactsById = (param) => getAction('/company/payContactsManagement/queryByIdGetContract', param)
// 加密获取key 与 iv
const getKeyIv = (param) => getAction('/sys/getEncryptedString',param)