Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop

huanghongfa

2022-04-19 d89d4a28653657528dc0718f1aa55e1c84ad1e6f

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComBatteryCommodityOrderDto.java

@@ -202,5 +202,8 @@
    @ApiModelProperty(value = "下单时间结束查询")
    private String endTime;

    @ApiModelProperty(value = "是否是小程序查询(1.是 2.否)")
    private Integer isApplets;

}