利玛窦
It was during Ming and Qing dynasty, when Roman Catholicism was introduced by Jesuit Priest Matteo Ricci, that the idea of "Shangdi" started to be applied to the Christian conception of God.