Merge branch 'master' into change0706

# Conflicts:
#	src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
This commit is contained in:
fengchenchen
2022-08-19 14:55:13 +08:00
+1 -1
View File
@@ -817,7 +817,7 @@ export default {
this.situationInfoLoading = true
this.showMoreInfo = false
// 通过id查询项目详情
if (!param.situationId) {
if (param.situationId) {
queryCommonProjectById({id: param.situationId}).then(res => {
if (res.success) {
console.log(res.result, 'res.result')