Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes

xuhy

2024-12-30 6ae4074360580e31b4b4bb9e9a3c56aa853b0269

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes

# Conflicts:
#	.idea/modules.xml

 manage/src/main/java/com/jilongda/manage/controller/TAppUserController.java

@@ -36,7 +36,7 @@
 * @since 2024-12-09
 */
@RestController
@Api(tags = "用户管理")
@Api(tags = "小程序用户管理")
@RequestMapping("/t-app-user")
public class TAppUserController {


 manage/src/main/java/com/jilongda/manage/query/TAppUserQuery.java

@@ -8,7 +8,7 @@
import java.util.List;

@Data
@ApiModel(value = "用户管理查询条件")
@ApiModel(value = "用户管理查询条件query")
public class TAppUserQuery extends BasePage {

    @ApiModelProperty(value = "微信昵称")

 manage/src/main/java/com/jilongda/manage/query/TCouponQuery.java

@@ -6,7 +6,7 @@
import lombok.Data;

@Data
@ApiModel(value = "用户管理查询条件")
@ApiModel(value = "优惠券查询条件")
public class TCouponQuery extends BasePage {
    @ApiModelProperty(value = "优惠券名称")
    private String name;