Merge remote-tracking branch 'origin/dev' into zs

# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/Activate.java

@@ -22,4 +22,5 @@ public class Activate  extends Model<Activate> {
     private BigDecimal handselNum;
     private String handselType;
     private String isDel;
+    private String isUser;
 }

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/ShopServiceImpl.java

@@ -130,8 +130,12 @@ public class ShopServiceImpl implements ShopService {
     @Override
     public void modityActivate(Activate activate) {
         if (Objects.nonNull(activate.getId()) && activate.getId() > 0){
+            activate.setHandselType("GD");
+            activate.setMaxNum(activate.getMinNum());
             activateMapper.updateById(activate);
         }else {
+            activate.setHandselType("GD");
+            activate.setMaxNum(activate.getMinNum());
             activateMapper.insert(activate);
         }
     }