Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-21 e0786b57f356db59efc6a4a3dd5e23908775286a

 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java

@@ -1186,8 +1186,10 @@
            }else {
                detailsVo.setUseType(1);
                detailsVo.setWriteOffTime(simpleDateFormat.format(byId.getVerificationTime()));
                StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
                detailsVo.setWriteOffName(courseOfStore.getStoreName());
                if (byId.getStoreId()!=null) {
                    StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
                    detailsVo.setWriteOffName(courseOfStore.getStoreName());
                }
            }
            switch (pmdsServiceById.getUseScope()){
                case 1: