# Conflicts: # src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java # src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java # src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java # src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java # src/main/resources/mapper/TbProductMapper.xml