# Conflicts: # mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java # mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java # mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java