去除相关权限标识

kmall-admin/src/main/java/com/kmall/admin/controller/MkActivitiesCombinationPriceController.java

@@ -31,7 +31,7 @@ public class MkActivitiesCombinationPriceController {
      * 查看列表
      */
     @RequestMapping("/list")
-    @RequiresPermissions("mkactivitiescombinationprice:list")
+//    @RequiresPermissions("mkactivitiescombinationprice:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         //查询列表数据
@@ -49,7 +49,7 @@ public class MkActivitiesCombinationPriceController {
      * 查看信息
      */
     @RequestMapping("/info/{macpId}")
-    @RequiresPermissions("mkactivitiescombinationprice:info")
+//    @RequiresPermissions("mkactivitiescombinationprice:info")
     @ResponseBody
     public R info(@PathVariable("macpId") Long macpId) {
         MkActivitiesCombinationPriceEntity mkActivitiesCombinationPrice = mkActivitiesCombinationPriceService.queryObject(macpId);
@@ -61,7 +61,7 @@ public class MkActivitiesCombinationPriceController {
      * 保存
      */
     @RequestMapping("/save")
-    @RequiresPermissions("mkactivitiescombinationprice:save")
+//    @RequiresPermissions("mkactivitiescombinationprice:save")
     @ResponseBody
     public R save(@RequestBody MkActivitiesCombinationPriceEntity mkActivitiesCombinationPrice) {
         mkActivitiesCombinationPriceService.save(mkActivitiesCombinationPrice);
@@ -73,7 +73,7 @@ public class MkActivitiesCombinationPriceController {
      * 修改
      */
     @RequestMapping("/update")
-    @RequiresPermissions("mkactivitiescombinationprice:update")
+//    @RequiresPermissions("mkactivitiescombinationprice:update")
     @ResponseBody
     public R update(@RequestBody MkActivitiesCombinationPriceEntity mkActivitiesCombinationPrice) {
         mkActivitiesCombinationPriceService.update(mkActivitiesCombinationPrice);
@@ -85,7 +85,7 @@ public class MkActivitiesCombinationPriceController {
      * 删除
      */
     @RequestMapping("/delete")
-    @RequiresPermissions("mkactivitiescombinationprice:delete")
+//    @RequiresPermissions("mkactivitiescombinationprice:delete")
     @ResponseBody
     public R delete(@RequestBody Long[]macpIds) {
         mkActivitiesCombinationPriceService.deleteBatch(macpIds);

kmall-admin/src/main/java/com/kmall/admin/controller/MkActivitiesDiscountController.java

@@ -31,7 +31,7 @@ public class MkActivitiesDiscountController {
      * 查看列表
      */
     @RequestMapping("/list")
-    @RequiresPermissions("mkactivitiesdiscount:list")
+//    @RequiresPermissions("mkactivitiesdiscount:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         //查询列表数据
@@ -49,7 +49,7 @@ public class MkActivitiesDiscountController {
      * 查看信息
      */
     @RequestMapping("/info/{madId}")
-    @RequiresPermissions("mkactivitiesdiscount:info")
+//    @RequiresPermissions("mkactivitiesdiscount:info")
     @ResponseBody
     public R info(@PathVariable("madId") Long madId) {
         MkActivitiesDiscountEntity mkActivitiesDiscount = mkActivitiesDiscountService.queryObject(madId);
@@ -61,7 +61,7 @@ public class MkActivitiesDiscountController {
      * 保存
      */
     @RequestMapping("/save")
-    @RequiresPermissions("mkactivitiesdiscount:save")
+//    @RequiresPermissions("mkactivitiesdiscount:save")
     @ResponseBody
     public R save(@RequestBody MkActivitiesDiscountEntity mkActivitiesDiscount) {
         mkActivitiesDiscountService.save(mkActivitiesDiscount);
@@ -73,7 +73,7 @@ public class MkActivitiesDiscountController {
      * 修改
      */
     @RequestMapping("/update")
-    @RequiresPermissions("mkactivitiesdiscount:update")
+//    @RequiresPermissions("mkactivitiesdiscount:update")
     @ResponseBody
     public R update(@RequestBody MkActivitiesDiscountEntity mkActivitiesDiscount) {
         mkActivitiesDiscountService.update(mkActivitiesDiscount);
@@ -85,7 +85,7 @@ public class MkActivitiesDiscountController {
      * 删除
      */
     @RequestMapping("/delete")
-    @RequiresPermissions("mkactivitiesdiscount:delete")
+//    @RequiresPermissions("mkactivitiesdiscount:delete")
     @ResponseBody
     public R delete(@RequestBody Long[]madIds) {
         mkActivitiesDiscountService.deleteBatch(madIds);

kmall-admin/src/main/java/com/kmall/admin/controller/MkActivitiesFullGiftController.java

@@ -31,7 +31,7 @@ public class MkActivitiesFullGiftController {
      * 查看列表
      */
     @RequestMapping("/list")
-    @RequiresPermissions("mkactivitiesfullgift:list")
+//    @RequiresPermissions("mkactivitiesfullgift:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         //查询列表数据
@@ -49,7 +49,7 @@ public class MkActivitiesFullGiftController {
      * 查看信息
      */
     @RequestMapping("/info/{mafrId}")
-    @RequiresPermissions("mkactivitiesfullgift:info")
+//    @RequiresPermissions("mkactivitiesfullgift:info")
     @ResponseBody
     public R info(@PathVariable("mafrId") Long mafrId) {
         MkActivitiesFullGiftEntity mkActivitiesFullGift = mkActivitiesFullGiftService.queryObject(mafrId);
@@ -61,7 +61,7 @@ public class MkActivitiesFullGiftController {
      * 保存
      */
     @RequestMapping("/save")
-    @RequiresPermissions("mkactivitiesfullgift:save")
+//    @RequiresPermissions("mkactivitiesfullgift:save")
     @ResponseBody
     public R save(@RequestBody MkActivitiesFullGiftEntity mkActivitiesFullGift) {
         mkActivitiesFullGiftService.save(mkActivitiesFullGift);
@@ -73,7 +73,7 @@ public class MkActivitiesFullGiftController {
      * 修改
      */
     @RequestMapping("/update")
-    @RequiresPermissions("mkactivitiesfullgift:update")
+//    @RequiresPermissions("mkactivitiesfullgift:update")
     @ResponseBody
     public R update(@RequestBody MkActivitiesFullGiftEntity mkActivitiesFullGift) {
         mkActivitiesFullGiftService.update(mkActivitiesFullGift);
@@ -85,7 +85,7 @@ public class MkActivitiesFullGiftController {
      * 删除
      */
     @RequestMapping("/delete")
-    @RequiresPermissions("mkactivitiesfullgift:delete")
+//    @RequiresPermissions("mkactivitiesfullgift:delete")
     @ResponseBody
     public R delete(@RequestBody Long[]mafrIds) {
         mkActivitiesFullGiftService.deleteBatch(mafrIds);

kmall-admin/src/main/java/com/kmall/admin/controller/MkActivitiesFullReductionController.java

@@ -33,7 +33,7 @@ public class MkActivitiesFullReductionController {
      * 查看列表
      */
     @RequestMapping("/list")
-    @RequiresPermissions("mkactivitiesfullreduction:list")
+//    @RequiresPermissions("mkactivitiesfullreduction:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         //查询列表数据
@@ -51,7 +51,7 @@ public class MkActivitiesFullReductionController {
      * 查看信息
      */
     @RequestMapping("/info/{mafrId}")
-    @RequiresPermissions("mkactivitiesfullreduction:info")
+//    @RequiresPermissions("mkactivitiesfullreduction:info")
     @ResponseBody
     public R info(@PathVariable("mafrId") Long mafrId) {
         MkActivitiesFullReductionEntity mkActivitiesFullReduction = mkActivitiesFullReductionService.queryObject(mafrId);
@@ -63,7 +63,7 @@ public class MkActivitiesFullReductionController {
      * 保存
      */
     @RequestMapping("/save")
-    @RequiresPermissions("mkactivitiesfullreduction:save")
+//    @RequiresPermissions("mkactivitiesfullreduction:save")
     @ResponseBody
     public R save(@RequestBody MkActivitiesFullReductionEntity mkActivitiesFullReduction) {
         mkActivitiesFullReductionService.save(mkActivitiesFullReduction);
@@ -75,7 +75,7 @@ public class MkActivitiesFullReductionController {
      * 修改
      */
     @RequestMapping("/update")
-    @RequiresPermissions("mkactivitiesfullreduction:update")
+//    @RequiresPermissions("mkactivitiesfullreduction:update")
     @ResponseBody
     public R update(@RequestBody MkActivitiesFullReductionEntity mkActivitiesFullReduction) {
         mkActivitiesFullReductionService.update(mkActivitiesFullReduction);
@@ -87,7 +87,7 @@ public class MkActivitiesFullReductionController {
      * 删除
      */
     @RequestMapping("/delete")
-    @RequiresPermissions("mkactivitiesfullreduction:delete")
+//    @RequiresPermissions("mkactivitiesfullreduction:delete")
     @ResponseBody
     public R delete(@RequestBody Long[]mafrIds) {
         mkActivitiesFullReductionService.deleteBatch(mafrIds);

kmall-admin/src/main/java/com/kmall/admin/controller/MkActivitiesGetOneFreeGoodsController.java

@@ -33,7 +33,7 @@ public class MkActivitiesGetOneFreeGoodsController {
      * 查看列表
      */
     @RequestMapping("/list")
-    @RequiresPermissions("mkactivitiesgetonefreegoods:list")
+//    @RequiresPermissions("mkactivitiesgetonefreegoods:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         //查询列表数据
@@ -51,7 +51,7 @@ public class MkActivitiesGetOneFreeGoodsController {
      * 查看信息
      */
     @RequestMapping("/info/{mkaFreeId}")
-    @RequiresPermissions("mkactivitiesgetonefreegoods:info")
+//    @RequiresPermissions("mkactivitiesgetonefreegoods:info")
     @ResponseBody
     public R info(@PathVariable("mkaFreeId") Long mkaFreeId) {
         MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoods = mkActivitiesGetOneFreeGoodsService.queryObject(mkaFreeId);
@@ -63,7 +63,7 @@ public class MkActivitiesGetOneFreeGoodsController {
      * 保存
      */
     @RequestMapping("/save")
-    @RequiresPermissions("mkactivitiesgetonefreegoods:save")
+//    @RequiresPermissions("mkactivitiesgetonefreegoods:save")
     @ResponseBody
     public R save(@RequestBody MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoods) {
         mkActivitiesGetOneFreeGoodsService.save(mkActivitiesGetOneFreeGoods);
@@ -75,7 +75,7 @@ public class MkActivitiesGetOneFreeGoodsController {
      * 修改
      */
     @RequestMapping("/update")
-    @RequiresPermissions("mkactivitiesgetonefreegoods:update")
+//    @RequiresPermissions("mkactivitiesgetonefreegoods:update")
     @ResponseBody
     public R update(@RequestBody MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoods) {
         mkActivitiesGetOneFreeGoodsService.update(mkActivitiesGetOneFreeGoods);
@@ -87,7 +87,7 @@ public class MkActivitiesGetOneFreeGoodsController {
      * 删除
      */
     @RequestMapping("/delete")
-    @RequiresPermissions("mkactivitiesgetonefreegoods:delete")
+//    @RequiresPermissions("mkactivitiesgetonefreegoods:delete")
     @ResponseBody
     public R delete(@RequestBody Long[]mkaFreeIds) {
         mkActivitiesGetOneFreeGoodsService.deleteBatch(mkaFreeIds);

kmall-admin/src/main/webapp/WEB-INF/page/mk/shop/mkactivitiescombinationprice.html → kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiescombinationprice.html

@@ -16,15 +16,9 @@
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
             <div class="buttons-group">
-                #if($shiro.hasPermission("mkactivitiescombinationprice:save"))
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivitiescombinationprice:update"))
                 <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivitiescombinationprice:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
-                #end
             </div>
         </Row>
 	    <table id="jqGrid"></table>
@@ -55,18 +49,6 @@
             <Form-item label="营销活动编号" prop="mkaId">
                 <i-input v-model="mkActivitiesCombinationPrice.mkaId" placeholder="营销活动编号"/>
             </Form-item>
-            <Form-item label="创建时间" prop="createTime">
-                <i-input v-model="mkActivitiesCombinationPrice.createTime" placeholder="创建时间"/>
-            </Form-item>
-            <Form-item label="创建人编号" prop="createrSn">
-                <i-input v-model="mkActivitiesCombinationPrice.createrSn" placeholder="创建人编号"/>
-            </Form-item>
-            <Form-item label="修改人编号" prop="moderSn">
-                <i-input v-model="mkActivitiesCombinationPrice.moderSn" placeholder="修改人编号"/>
-            </Form-item>
-            <Form-item label="修改时间" prop="updateTime">
-                <i-input v-model="mkActivitiesCombinationPrice.updateTime" placeholder="修改时间"/>
-            </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
@@ -76,6 +58,6 @@
 	</Card>
 </div>
 
-<script src="${rc.contextPath}/js/mk/shop/mkactivitiescombinationprice.js?_${date.systemTime}"></script>
+<script src="${rc.contextPath}/js/mk/mkactivitiescombinationprice.js?_${date.systemTime}"></script>
 </body>
 </html>

kmall-admin/src/main/webapp/WEB-INF/page/mk/shop/mkactivitiesdiscount.html → kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesdiscount.html

@@ -16,15 +16,9 @@
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
             <div class="buttons-group">
-                #if($shiro.hasPermission("mkactivitiesdiscount:save"))
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivitiesdiscount:update"))
                 <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivitiesdiscount:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
-                #end
             </div>
         </Row>
 	    <table id="jqGrid"></table>
@@ -61,18 +55,6 @@
             <Form-item label="营销活动编号" prop="mkaId">
                 <i-input v-model="mkActivitiesDiscount.mkaId" placeholder="营销活动编号"/>
             </Form-item>
-            <Form-item label="创建时间" prop="createTime">
-                <i-input v-model="mkActivitiesDiscount.createTime" placeholder="创建时间"/>
-            </Form-item>
-            <Form-item label="创建人编号" prop="createrSn">
-                <i-input v-model="mkActivitiesDiscount.createrSn" placeholder="创建人编号"/>
-            </Form-item>
-            <Form-item label="修改人编号" prop="moderSn">
-                <i-input v-model="mkActivitiesDiscount.moderSn" placeholder="修改人编号"/>
-            </Form-item>
-            <Form-item label="修改时间" prop="updateTime">
-                <i-input v-model="mkActivitiesDiscount.updateTime" placeholder="修改时间"/>
-            </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
@@ -82,6 +64,6 @@
 	</Card>
 </div>
 
-<script src="${rc.contextPath}/js/mk/shop/mkactivitiesdiscount.js?_${date.systemTime}"></script>
+<script src="${rc.contextPath}/js/mk/mkactivitiesdiscount.js?_${date.systemTime}"></script>
 </body>
 </html>

kmall-admin/src/main/webapp/WEB-INF/page/mk/shop/mkactivitiesfullgift.html → kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesfullgift.html

@@ -16,15 +16,9 @@
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
             <div class="buttons-group">
-                #if($shiro.hasPermission("mkactivitiesfullgift:save"))
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivitiesfullgift:update"))
                 <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivitiesfullgift:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
-                #end
             </div>
         </Row>
 	    <table id="jqGrid"></table>
@@ -58,18 +52,6 @@
             <Form-item label="赠品条码" prop="giftBarcode">
                 <i-input v-model="mkActivitiesFullGift.giftBarcode" placeholder="赠品条码"/>
             </Form-item>
-            <Form-item label="创建时间" prop="createTime">
-                <i-input v-model="mkActivitiesFullGift.createTime" placeholder="创建时间"/>
-            </Form-item>
-            <Form-item label="创建人编号" prop="createrSn">
-                <i-input v-model="mkActivitiesFullGift.createrSn" placeholder="创建人编号"/>
-            </Form-item>
-            <Form-item label="修改人编号" prop="moderSn">
-                <i-input v-model="mkActivitiesFullGift.moderSn" placeholder="修改人编号"/>
-            </Form-item>
-            <Form-item label="修改时间" prop="updateTime">
-                <i-input v-model="mkActivitiesFullGift.updateTime" placeholder="修改时间"/>
-            </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
@@ -79,6 +61,6 @@
 	</Card>
 </div>
 
-<script src="${rc.contextPath}/js/mk/shop/mkactivitiesfullgift.js?_${date.systemTime}"></script>
+<script src="${rc.contextPath}/js/mk/mkactivitiesfullgift.js?_${date.systemTime}"></script>
 </body>
 </html>

kmall-admin/src/main/webapp/WEB-INF/page/mk/shop/mkactivitiesfullreduction.html → kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesfullreduction.html

@@ -18,15 +18,9 @@
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
             <div class="buttons-group">
-                #if($shiro.hasPermission("mkactivitiesfullreduction:save"))
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivitiesfullreduction:update"))
                 <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivitiesfullreduction:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
-                #end
             </div>
         </Row>
 	    <table id="jqGrid"></table>
@@ -60,18 +54,6 @@
             <Form-item label="减扣金额" prop="deductionAmount">
                 <i-input v-model="mkActivitiesFullReduction.deductionAmount" placeholder="减扣金额"/>
             </Form-item>
-            <Form-item label="创建时间" prop="createTime">
-                <i-input v-model="mkActivitiesFullReduction.createTime" placeholder="创建时间"/>
-            </Form-item>
-            <Form-item label="创建人编号" prop="createrSn">
-                <i-input v-model="mkActivitiesFullReduction.createrSn" placeholder="创建人编号"/>
-            </Form-item>
-            <Form-item label="修改人编号" prop="moderSn">
-                <i-input v-model="mkActivitiesFullReduction.moderSn" placeholder="修改人编号"/>
-            </Form-item>
-            <Form-item label="修改时间" prop="updateTime">
-                <i-input v-model="mkActivitiesFullReduction.updateTime" placeholder="修改时间"/>
-            </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
@@ -81,6 +63,6 @@
 	</Card>
 </div>
 
-<script src="${rc.contextPath}/js/mk/shop/mkactivitiesfullreduction.js?_${date.systemTime}"></script>
+<script src="${rc.contextPath}/js/mk/mkactivitiesfullreduction.js?_${date.systemTime}"></script>
 </body>
 </html>

kmall-admin/src/main/webapp/WEB-INF/page/mk/shop/mkactivitiesgetonefreegoods.html → kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesgetonefreegoods.html

@@ -19,15 +19,9 @@
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
             <div class="buttons-group">
-                #if($shiro.hasPermission("mkactivitiesgetonefreegoods:save"))
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivitiesgetonefreegoods:update"))
                 <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivitiesgetonefreegoods:delete"))
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
-                #end
             </div>
         </Row>
 	    <table id="jqGrid"></table>
@@ -70,18 +64,6 @@
             <Form-item label="营销活动编号" prop="mkaId">
                 <i-input v-model="mkActivitiesGetOneFreeGoods.mkaId" placeholder="营销活动编号"/>
             </Form-item>
-            <Form-item label="创建时间" prop="createTime">
-                <i-input v-model="mkActivitiesGetOneFreeGoods.createTime" placeholder="创建时间"/>
-            </Form-item>
-            <Form-item label="创建人编号" prop="createrSn">
-                <i-input v-model="mkActivitiesGetOneFreeGoods.createrSn" placeholder="创建人编号"/>
-            </Form-item>
-            <Form-item label="修改人编号" prop="moderSn">
-                <i-input v-model="mkActivitiesGetOneFreeGoods.moderSn" placeholder="修改人编号"/>
-            </Form-item>
-            <Form-item label="修改时间" prop="updateTime">
-                <i-input v-model="mkActivitiesGetOneFreeGoods.updateTime" placeholder="修改时间"/>
-            </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
@@ -91,6 +73,6 @@
 	</Card>
 </div>
 
-<script src="${rc.contextPath}/js/mk/shop/mkactivitiesgetonefreegoods.js?_${date.systemTime}"></script>
+<script src="${rc.contextPath}/js/mk/mkactivitiesgetonefreegoods.js?_${date.systemTime}"></script>
 </body>
 </html>

kmall-admin/src/main/webapp/js/mk/shop/mkactivitiescombinationprice.js → kmall-admin/src/main/webapp/js/mk/mkactivitiescombinationprice.js

@@ -3,18 +3,13 @@ $(function () {
         url: '../mkactivitiescombinationprice/list',
         datatype: "json",
         colModel: [
-			{label: 'macpId', name: 'macpId', index: 'macp_id', key: true, hidden: true},
 			{label: '组合条码', name: 'combinationBarcode', index: 'combination_barcode', width: 80},
 			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80},
 			{label: '条形码', name: 'barcode', index: 'barcode', width: 80},
 			{label: '组合的产品数量', name: 'combinationNum', index: 'combination_num', width: 80},
 			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80},
 			{label: '组合价', name: 'combinedPrice', index: 'combined_price', width: 80},
-			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-			{label: '修改时间', name: 'updateTime', index: 'update_time', width: 80}],
+			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},],
 		viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -146,4 +141,4 @@ let vm = new Vue({
             handleResetForm(this, name);
         }
 	}
-});
+});

kmall-admin/src/main/webapp/js/mk/shop/mkactivitiesdiscount.js → kmall-admin/src/main/webapp/js/mk/mkactivitiesdiscount.js

@@ -3,7 +3,6 @@ $(function () {
         url: '../mkactivitiesdiscount/list',
         datatype: "json",
         colModel: [
-			{label: 'madId', name: 'madId', index: 'mad_id', key: true, hidden: true},
 			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80},
 			{label: '活动价格', name: 'activityPrice', index: 'activity_price', width: 80},
 			{label: '门店编号', name: 'shopSn', index: 'shop_sn', width: 80},
@@ -12,11 +11,7 @@ $(function () {
 			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80},
 			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80},
 			{label: '折扣', name: 'discount', index: 'discount', width: 80},
-			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-			{label: '修改时间', name: 'updateTime', index: 'update_time', width: 80}],
+			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},],
 		viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -148,4 +143,4 @@ let vm = new Vue({
             handleResetForm(this, name);
         }
 	}
-});
+});

kmall-admin/src/main/webapp/js/mk/shop/mkactivitiesfullgift.js → kmall-admin/src/main/webapp/js/mk/mkactivitiesfullgift.js

@@ -3,7 +3,6 @@ $(function () {
         url: '../mkactivitiesfullgift/list',
         datatype: "json",
         colModel: [
-			{label: 'mafrId', name: 'mafrId', index: 'mafr_id', key: true, hidden: true},
 			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80},
 			{label: '门店编号', name: 'shopSn', index: 'shop_sn', width: 80},
 			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80},
@@ -11,11 +10,7 @@ $(function () {
 			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80},
 			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80},
 			{label: '满足条件金额', name: 'qualifiedAmount', index: 'qualified_amount', width: 80},
-			{label: '赠品条码', name: 'giftBarcode', index: 'gift_barcode', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-			{label: '修改时间', name: 'updateTime', index: 'update_time', width: 80}],
+			{label: '赠品条码', name: 'giftBarcode', index: 'gift_barcode', width: 80},],
 		viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -147,4 +142,4 @@ let vm = new Vue({
             handleResetForm(this, name);
         }
 	}
-});
+});

kmall-admin/src/main/webapp/js/mk/shop/mkactivitiesfullreduction.js → kmall-admin/src/main/webapp/js/mk/mkactivitiesfullreduction.js

@@ -3,7 +3,6 @@ $(function () {
         url: '../mkactivitiesfullreduction/list',
         datatype: "json",
         colModel: [
-			{label: 'mafrId', name: 'mafrId', index: 'mafr_id', key: true, hidden: true},
 			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80},
 			{label: '门店编号', name: 'shopSn', index: 'shop_sn', width: 80},
 			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80},
@@ -11,11 +10,7 @@ $(function () {
 			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80},
 			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80},
 			{label: '满足条件金额', name: 'qualifiedAmount', index: 'qualified_amount', width: 80},
-			{label: '减扣金额', name: 'deductionAmount', index: 'deduction_amount', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-			{label: '修改时间', name: 'updateTime', index: 'update_time', width: 80}],
+			{label: '减扣金额', name: 'deductionAmount', index: 'deduction_amount', width: 80},],
 		viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -147,4 +142,4 @@ let vm = new Vue({
             handleResetForm(this, name);
         }
 	}
-});
+});

kmall-admin/src/main/webapp/js/mk/shop/mkactivitiesgetonefreegoods.js → kmall-admin/src/main/webapp/js/mk/mkactivitiesgetonefreegoods.js

@@ -3,7 +3,6 @@ $(function () {
         url: '../mkactivitiesgetonefreegoods/list',
         datatype: "json",
         colModel: [
-			{label: 'mkaFreeId', name: 'mkaFreeId', index: 'mka_free_id', key: true, hidden: true},
 			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80},
 			{label: '每日最低价', name: 'edlp', index: 'edlp', width: 80},
 			{label: '建议零售价', name: 'suggestedRetailPrice', index: 'suggested_retail_price', width: 80},
@@ -14,11 +13,7 @@ $(function () {
 			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80},
 			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80},
 			{label: '赠品条码', name: 'giftBarcode', index: 'gift_barcode', width: 80},
-			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-			{label: '修改时间', name: 'updateTime', index: 'update_time', width: 80}],
+			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},],
 		viewrecords: true,
         height: 550,
         rowNum: 10,
@@ -150,4 +145,4 @@ let vm = new Vue({
             handleResetForm(this, name);
         }
 	}
-});
+});