res_account.cs
5.26 KB
-
Merge branch 'v2020morge' into v2020morge-graphql · b1d5311f
# Conflicts: # performance/Performance.Api/wwwroot/Performance.EntityModels.xml # performance/Performance.EntityModels/Entity/res_account.cs # performance/Performance.EntityModels/Entity/sys_hospital.cs
钟博 committed