confict

Helius

2021-02-03 fed1f885b03a5b4b7c62d44320c3ff2068ca02e6

 zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/VipCreateTask.java

@@ -65,6 +65,7 @@
                    vipInfo.setSex(userInfo.getGender().equals("1") ? "男" : "女");
                }
                vipInfo.setVipName(userInfo.getNickName());
                vipInfo.setCompanyId(userInfo.getCompanyId());
                vipInfo.setShopId(shopId);
                vipInfo.setArrivalWay("微商城");
                vipInfo.setVipState(Dictionary.VIP_STATE_HY);