Resolve_conflict The following script resolves the conflict by adding the difference between new and old rows to the quantity value in the consolidated database

• resolve_conflict以下脚本通过将旧行和新行之间的差加到统一数据库的数量值中来解决冲突