# Conflicts: # src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
#cashier-client