Merge remote-tracking branch 'origin/upgrade' into upgrade

This commit is contained in:
TS-QD1 2023-11-04 17:58:12 +08:00
commit b6bb806643

View File

@ -758,7 +758,8 @@
t1.party_organization, t1.party_organization,
t1.party_time, t1.party_time,
t1.othertext, t1.othertext,
t1.population_info_id t1.population_info_id,
t1.creator
FROM FROM
population_population_info t1 population_population_info t1
WHERE WHERE