You can do it either way. Just be sure to account for what the overall effect is on the total volume. I often add all my salts for the batch to my mashing water when brewing light lagers where I want minimal minerals in the finished beer, but want elevated calcium in the mash tun.