Merge remote-tracking branch 'origin/master'

nickchange

2023-10-27 200acf9283ff06e75874df263b1e125a71e76215

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tCoupon/TCouponInfo.html

@@ -47,6 +47,7 @@
        <input hidden id="two" value="${two}">
        <input hidden id="three" value="${three}">
        <input hidden id="city" value="${city}">
        <input hidden id="objectType" value="${objectType}">
        <div class="form-horizontal">
            <div class="row">
                <div class="col-sm-6">
@@ -131,6 +132,9 @@
                </div>
            </div>

            @if(objectType == 1){


            <div class="row" id="exchangeType"  >
                <div class="col-sm-6">
                    <div class="form-group">
@@ -163,7 +167,7 @@
                    
                </div>
            </div>

            @}
            <div class="row" id="needIntegral" >
                <div class="col-sm-6">
                    <div class="form-group">
@@ -229,7 +233,7 @@
                           placeholder="请选择"/>
                </div>
            </div>

            @if(objectType == 1){
            <div class="row" id="app" >
                <div class="col-sm-6">
                    <div class="form-group">
@@ -255,7 +259,7 @@
                    
                </div>
            </div>

            @}
            <div class="row" id="belongsCon" >
                <div class="col-sm-6">
                    <div class="form-group">