| content |
{"Commits":[{"Sha1":"37a972f9c {"Commits":[{"Sha1":"37a972f9c73935580738d52261c1c00d425ffbff","Message":"Merge remote-tracking branch 'pay/pay' into pay-260616\n\n# Conflicts:\n#\t.gitignore\n#\tapplication/models/Ahead_book_order_model.php\n#\tweb/Hi-Zan/Hi-Zan/app.json\n#\tweb/Hi-Zan/Hi-Zan/pages/community-reserve/order-detail/order-detail.js\n#\tweb/Hi-Zan/Hi-Zan/pages/community-reserve/order-detail/order-detail.wxml\n#\tweb/Hi-Zan/Hi-Zan/pages/convert-room/apply/apply.js\n#\tweb/Hi-Zan/Hi-Zan/pages/convert-room/apply/apply.wxml\n#\tweb/Hi-Zan/Hi-Zan/pages/convert-room/apply/apply.wxss\n#\tweb/Hi-Zan/Hi-Zan/pages/convert-room/new-room/new-room.js\n#\tweb/Hi-Zan/Hi-Zan/pages/convert-room/new-room/new-room.wxml\n#\tweb/Hi-Zan/Hi-Zan/pages/convert-room/new-room/new-room.wxss\n","AuthorEmail":"121158035@qq.com","AuthorName":"zhangjunnan","CommitterEmail":"121158035@qq.com","CommitterName":"zhangjunnan","Timestamp":"2026-06-09T10:14:05+08:00"},{"Sha1":"eedc29ef200355fa04636394bc0009470f3a68fc","Message":"Merge remote-tracking branch 'pay/pay-260616' into pay-260616\n","AuthorEmail":"121158035@qq.com","AuthorName":"zhangjunnan","CommitterEmail":"121158035@qq.com","CommitterName":"zhangjunnan","Timestamp":"2026-06-09T10:04:15+08:00"},{"Sha1":"4d40b955cab3e5bede94a249da333a532ffec85e","Message":"Merge pull request '需求 订单回执' (#276) from pay-260519 into pay\n\nReviewed-on: https://gitea.g-hi.com/vodtest/pay/pulls/276\n","AuthorEmail":"121158035@qq.com","AuthorName":"zhangjunnan","CommitterEmail":"121158035@qq.com","CommitterName":"zhangjunnan","Timestamp":"2026-06-09T10:02:49+08:00"},{"Sha1":"4256eaa8467d08127832345fe1f95760828b9de7","Message":"Merge remote-tracking branch 'pay/pay-260616' into pay-260616\n","AuthorEmail":"121158035@qq.com","AuthorName":"zhangjunnan","CommitterEmail":"121158035@qq.com","CommitterName":"zhangjunnan","Timestamp":"2026-06-09T09:25:35+08:00"},{"Sha1":"e979668be67382008cd81d515684b7c5bee42251","Message":"周会接口\n","AuthorEmail":"121158035@qq.com","AuthorName":"zhangjunnan","CommitterEmail":"121158035@qq.com","CommitterName":"zhangjunnan","Timestamp":"2026-06-05T16:03:19+08:00"}],"HeadCommit":{"Sha1":"37a972f9c73935580738d52261c1c00d425ffbff","Message":"Merge remote-tracking branch 'pay/pay' into pay-260616\n\n# Conflicts:\n#\t.gitignore\n#\tapplication/models/Ahead_book_order_model.php\n#\tweb/Hi-Zan/Hi-Zan/app.json\n#\tweb/Hi-Zan/Hi-Zan/pages/community-reserve/order-detail/order-detail.js\n#\tweb/Hi-Zan/Hi-Zan/pages/community-reserve/order-detail/order-detail.wxml\n#\tweb/Hi-Zan/Hi-Zan/pages/convert-room/apply/apply.js\n#\tweb/Hi-Zan/Hi-Zan/pages/convert-room/apply/apply.wxml\n#\tweb/Hi-Zan/Hi-Zan/pages/convert-room/apply/apply.wxss\n#\tweb/Hi-Zan/Hi-Zan/pages/convert-room/new-room/new-room.js\n#\tweb/Hi-Zan/Hi-Zan/pages/convert-room/new-room/new-room.wxml\n#\tweb/Hi-Zan/Hi-Zan/pages/convert-room/new-room/new-room.wxss\n","AuthorEmail":"121158035@qq.com","AuthorName":"zhangjunnan","CommitterEmail":"121158035@qq.com","CommitterName":"zhangjunnan","Timestamp":"2026-06-09T10:14:05+08:00"},"CompareURL":"vodtest/pay/compare/56093091bed2b573d65ab6ba5abc02bb633d2263...37a972f9c73935580738d52261c1c00d425ffbff","Len":48}... |