develop # Conflicts: # mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java # mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java # mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java # mallinkAdmin/src/main/java/com/iformall/controller/WxOrderController.java # mallinkAdmin/src/main/java/com/iformall/controller/WxPayOrderController.java # mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java # mallinkAdmin/src/main/java/com/iformall/controller/WxScoreRulesController.java # mallinkAdmin/src/main/java/com/iformall/controller/WxTagsController.java # mallinkService/src/main/java/com/iformall/common/ErrorCode.java # mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java # mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java