Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDr...

puzhibing

2023-07-26 709a4a10be56952ead6340e4822fce41a66e47cd

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java

@@ -235,7 +235,11 @@
            tUserToCoupon.setExpireTime(expireTime);

            // 添加发放人id和类型
            tUserToCoupon.setObjectId(ShiroKit.getUser().getObjectId());
            if(ShiroKit.getUser().getRoleType() == 1){
                tUserToCoupon.setObjectId(1);
            }else {
                tUserToCoupon.setObjectId(ShiroKit.getUser().getObjectId());
            }
            tUserToCoupon.setRoleType(ShiroKit.getUser().getRoleType());

            tUserToCoupons.add(tUserToCoupon);