11.9

nickchange

2023-11-17 0e71f0acc2d4ab86315ecda65d01918b257810d4

11.9

 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java

@@ -224,7 +224,8 @@
                            CouponStore couponStore = csMapper.selectOne(new QueryWrapper<CouponStore>()
                                    .eq("couponId",coupon.getId()));
                            StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(couponStore.getStoreId());
                            packageResp.setCityOrStore(courseOfStore.getStoreName()+","+courseOfStore.getStoreAddr());
//                            packageResp.setCityOrStore(courseOfStore.getStoreName()+","+courseOfStore.getStoreAddr());
                            packageResp.setCityOrStore(courseOfStore.getStoreName());
                            break;
                        default:
                            break;

 cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js

@@ -247,9 +247,7 @@

    this.clearData();
    this.collectData();
    if(!this.validate()){
        return ;
    }


    const quantityIssuedInput = document.getElementById('quantityIssued');
    const pickUpQuantityInput = document.getElementById('pickUpQuantity');
@@ -625,9 +623,7 @@
    let company = 3;
    this.clearData();
    this.collectData();
    if(!this.validate()){
        return ;
    }

    var cityIds = [];
    var cts = "";
    if (company === '2'){