Merge remote-tracking branch 'origin/master'

puzhibing

2023-03-18 b397b0aefc81cb0475d347ebad16e565254c06e2

 management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html

@@ -14,7 +14,7 @@
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <span style="color:red">*</span>
                                <label class="control-label" >优惠券名称:</label>
                                <input id="couponName" name="couponName" type="text" style="height: 30px" required="required">
                                <input id="couponName" name="couponName" type="text" maxlength="20" placeholder="最多输入20个字符" style="height: 30px" required="required">
                            </div>
                        </div>

@@ -45,7 +45,7 @@
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <span style="color:red">*</span>
                                <label class="control-label">优惠券限制数量：</label>
                                <input id="couponCount" name="couponCount" type="number" style="height: 30px" required>
                                <input id="couponCount" name="couponCount" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
                            </div>
                        </div>

@@ -53,7 +53,7 @@
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <span style="color:red">*</span>
                                <label class="control-label">条件金额：订单满</label>
                                <input id="couponConditionalAmount" name="couponConditionalAmount" type="number" style="height: 30px" required>
                                <input id="couponConditionalAmount" name="couponConditionalAmount" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
                            </div>
                            <div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
                                <label>可使用</label>
@@ -64,7 +64,7 @@
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <span style="color:red">*</span>
                                <label class="control-label">优惠金额：</label>
                                <input id="couponPreferentialAmount" name="couponPreferentialAmount" type="number" style="height: 30px" required>
                                <input id="couponPreferentialAmount" name="couponPreferentialAmount" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
                            </div>
                        </div>

@@ -72,7 +72,7 @@
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <span style="color:red">*</span>
                                <label class="control-label">有效期：</label>
                                <input id="couponValidity" name="couponValidity" type="number" style="height: 30px" required>
                                <input id="couponValidity" name="couponValidity" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
                            </div>
                            <div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
                                <label>天</label>
@@ -83,7 +83,7 @@
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <span style="color:red">*</span>
                                <label class="control-label">优惠券总量：</label>
                                <input id="remainingQuantity" name="remainingQuantity" type="number" style="height: 30px" required>
                                <input id="remainingQuantity" name="remainingQuantity" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
                            </div>
                        </div>

@@ -91,7 +91,7 @@
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <span style="color:red">*</span>
                                <label class="control-label">赠送数量：</label>
                                <input id="couponSendQuantity" name="couponSendQuantity" type="number" style="height: 30px" required>
                                <input id="couponSendQuantity" name="couponSendQuantity" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
                            </div>
                            <div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
                                <label>张</label>