Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 a0f33f915dd4128d98111f67a3c75b1676adae32

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

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

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

    @ApiModelProperty(value = "是否是后台查询(1.是 2.否)",hidden = true)
    private Integer isAdmin;

}